Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using /unicode when running ildasm.exe roundtrip tests #71163

Merged
merged 3 commits into from
Jul 7, 2022
Merged

Using /unicode when running ildasm.exe roundtrip tests #71163

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9238232
Using /unicode when running ildasm.exe roundtrip tests
TIHan Jun 22, 2022
c500631
Added /unicode flag
TIHan Jul 5, 2022
e5ed018
Update issues.targets
TIHan Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/tests/Common/CLRTest.Jit.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ export RunningIlasmRoundTrip=
]]>
</IlasmRoundTripBashScript>

<IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
<IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'">
<![CDATA[
# IlasmRoundTrip Script
# Disable Ilasm round-tripping for Linker tests.
# Todo: Ilasm round-trip on linked binaries.

if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ];
then
echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
"$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName)
echo "$CORE_ROOT/ildasm" -raweh /unicode -out=$(DisassemblyName) $(InputAssemblyName)
"$CORE_ROOT/ildasm" -raweh /unicode -out=$(DisassemblyName) $(InputAssemblyName)
ERRORLEVEL=$?
if [ $ERRORLEVEL -ne 0 ]
then
Expand Down Expand Up @@ -133,8 +134,8 @@ REM Disable Ilasm round-tripping for Linker tests.
REM Todo: Ilasm round-trip on linked binaries.
IF NOT DEFINED DoLink (
IF DEFINED RunningIlasmRoundTrip (
ECHO %CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
%CORE_ROOT%\ildasm.exe /raweh /out=$(DisassemblyName) $(InputAssemblyName)
ECHO %CORE_ROOT%\ildasm.exe /raweh /unicode /out=$(DisassemblyName) $(InputAssemblyName)
%CORE_ROOT%\ildasm.exe /raweh /unicode /out=$(DisassemblyName) $(InputAssemblyName)
TIHan marked this conversation as resolved.
Show resolved Hide resolved

IF NOT "!ERRORLEVEL!"=="0" (
ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL!
Expand Down