diff options
| author | John Chen (CLR) <jochen@microsoft.com> | 2016-06-15 11:11:37 -0700 |
|---|---|---|
| committer | John Chen (CLR) <jochen@microsoft.com> | 2016-06-15 11:11:37 -0700 |
| commit | d33d62e74cd8577420160685190e5c1eabfed9bb (patch) | |
| tree | c20c62967c02a8779f6e89e28a758de095b0ee59 | |
| parent | 25b1e6a9eb3cac4abadaf1a65d7a75448cc7597e (diff) | |
| download | coreclr-d33d62e74cd8577420160685190e5c1eabfed9bb.tar.gz coreclr-d33d62e74cd8577420160685190e5c1eabfed9bb.tar.bz2 coreclr-d33d62e74cd8577420160685190e5c1eabfed9bb.zip | |
Modify CrossGen test script to work around cmd.exe bug
| -rw-r--r-- | tests/src/CLRTest.CrossGen.targets | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/src/CLRTest.CrossGen.targets b/tests/src/CLRTest.CrossGen.targets index 9d0f28c69d..4bb86639dc 100644 --- a/tests/src/CLRTest.CrossGen.targets +++ b/tests/src/CLRTest.CrossGen.targets @@ -75,16 +75,17 @@ if defined RunCrossGen ( set COMPlus_ZapRequireList=$(MSBuildProjectName) if not exist "$(MSBuildProjectName).ni.exe" ( call :TakeLock + set CrossGenStatus=0 if not exist "$(MSBuildProjectName).ni.exe" ( echo "%_DebuggerFullPath% %CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%~dp0 $(MSBuildProjectName).exe %_DebuggerFullPath% "%CORE_ROOT%\crossgen.exe" /Platform_Assemblies_Paths %CORE_ROOT%%3B%~dp0 $(MSBuildProjectName).exe - IF NOT !ERRORLEVEL!==0 ( - ECHO Crossgen failed with exitcode - !ERRORLEVEL! - call :ReleaseLock + set CrossGenStatus=!ERRORLEVEL! + ) + call :ReleaseLock + IF NOT !CrossGenStatus!==0 ( + ECHO Crossgen failed with exitcode - !CrossGenStatus! Exit /b 1 - ) - ) - call :ReleaseLock + ) ) ) ]]> |