diff options
Diffstat (limited to 'tests/src/CLRTest.Execute.Bash.targets')
-rw-r--r-- | tests/src/CLRTest.Execute.Bash.targets | 53 |
1 files changed, 7 insertions, 46 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index f015cc710d..f95408f512 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -18,45 +18,6 @@ WARNING: When setting properties based on their current state (for example: --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target - Name="GetIlasmRoundTripBashScript" - Returns="$(IlasmRoundTripBashScript)"> - <PropertyGroup> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> - <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> - <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> - <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> - - <IlasmRoundTripBashScript Condition="'$(IlasmRoundTrip)'=='true'"> - <![CDATA[ -# Disable Ilasm round-tripping for Linker tests. -# Todo: Ilasm round-trip on linked binaries. - -if [ -z "$DoLink" ]; -then - echo "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) - "$CORE_ROOT/ildasm" -raweh -out=$(DisassemblyName) $(InputAssemblyName) - ERRORLEVEL=$? - if [ $ERRORLEVEL -ne 0 ] - then - echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL - exit 1 - fi - - echo "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - "$CORE_ROOT/ilasm" -output=$(TargetAssemblyName) $(_IlasmSwitches) $(DisassemblyName) - ERRORLEVEL=$? - if [ $ERRORLEVEL -ne 0 ] - then - echo EXECUTION OF ILASM - FAILED $ERRORLEVEL - exit 1 - fi -fi - ]]> - </IlasmRoundTripBashScript> - </PropertyGroup> - </Target> - <!-- This is here because of this bug: http://blogs.msdn.com/b/msbuild/archive/2006/01/03/508629.aspx--> <Target Name="FetchExternalPropertiesForXpalt"> <!--Call GetExecuteShFullPath to get ToRunProject cmd file Path --> @@ -122,9 +83,9 @@ fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) -if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) ] +if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ] then - echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts) IS SET" + echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET" exit $(GCBashScriptExitCode) fi ]]></BashCLRTestEnvironmentCompatibilityCheck> @@ -275,10 +236,11 @@ fi </PropertyGroup> <PropertyGroup> <_CLRTestRunFile Condition="'$(CLRTestIsHosted)'=='true'">"$CORE_ROOT/corerun"</_CLRTestRunFile> - <BashCLRTestLaunchCmds Condition="'$(IlasmRoundTrip)'=='true'"><![CDATA[ -if [ -z "$DoLink" ]; then - echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments - $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments + <BashCLRTestLaunchCmds><![CDATA[ +if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ]; +then + echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments + $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments if [ $? -ne $CLRTestExpectedExitCode ] then echo END EXECUTION OF IL{D}ASM BINARY - FAILED $? vs $CLRTestExpectedExitCode @@ -408,7 +370,6 @@ $(BashCLRTestEnvironmentCompatibilityCheck) $(BashCLRTestArgPrep) $(BashCLRTestExitCodePrep) $(JitDisasmBashScript) -# IlasmRoundTrip Script $(IlasmRoundTripBashScript) # PreCommands $(BashCLRTestPreCommands) |