diff options
| author | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
|---|---|---|
| committer | Jiyoung Yun <jy910.yun@samsung.com> | 2016-12-27 16:46:08 +0900 |
| commit | db20f3f1bb8595633a7e16c8900fd401a453a6b5 (patch) | |
| tree | e5435159cd1bf0519276363a6fe1663d1721bed3 /tests/src/CLRTest.Execute.Batch.targets | |
| parent | 4b4aad7217d3292650e77eec2cf4c198ea9c3b4b (diff) | |
| download | coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.gz coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.tar.bz2 coreclr-db20f3f1bb8595633a7e16c8900fd401a453a6b5.zip | |
Imported Upstream version 1.0.0.9127upstream/1.0.0.9127
Diffstat (limited to 'tests/src/CLRTest.Execute.Batch.targets')
| -rw-r--r-- | tests/src/CLRTest.Execute.Batch.targets | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/src/CLRTest.Execute.Batch.targets b/tests/src/CLRTest.Execute.Batch.targets index 8e2e5f163b..5de78b42f6 100644 --- a/tests/src/CLRTest.Execute.Batch.targets +++ b/tests/src/CLRTest.Execute.Batch.targets @@ -95,7 +95,7 @@ IF NOT "!ERRORLEVEL!"=="0" ( <Target Name="GenerateBatchExecutionScript" Inputs="$(MSBuildProjectFullPath)" Outputs="$(OutputPath)\$(MSBuildProjectName).cmd" - DependsOnTargets="FetchExternalProperties;$(BatchScriptSnippetGen);GetIlasmRoundTripBatchScript"> + DependsOnTargets="FetchExternalProperties;$(BatchScriptSnippetGen);GetJitDisasmBatchScript;GetIlasmRoundTripBatchScript"> <Message Text="Project depends on $(_CLRTestToRunFileFullPath)." Condition="'$(_CLRTestNeedsProjectToRun)' == 'True'" /> @@ -114,6 +114,13 @@ IF "%COMPlus_JitStress%"=="" IF "%COMPlus_JitStressRegs%"=="" IF "%COMPlus_JITMi Exit /b 0 :Compatible1 ]]></BatchCLRTestEnvironmentCompatibilityCheck> + <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(HeapVerifyIncompatible)' == 'true'"><![CDATA[ +$(BatchCLRTestEnvironmentCompatibilityCheck) +IF NOT "%COMPlus_HeapVerify%"=="" ( + ECHO SKIPPING EXECUTION BECAUSE COMPlus_HeapVerify IS SET + Exit /b 0 +) + ]]></BatchCLRTestEnvironmentCompatibilityCheck> <BatchCLRTestExitCodePrep Condition="$(_CLRTestNeedsToRun)"> <![CDATA[ @@ -320,6 +327,8 @@ $(BatchEnvironmentVariables) $(BatchCLRTestEnvironmentCompatibilityCheck) +$(JitDisasmBatchScript) + REM IlasmRoundTrip Script $(IlasmRoundTripBatchScript) |