From d33d62e74cd8577420160685190e5c1eabfed9bb Mon Sep 17 00:00:00 2001 From: "John Chen (CLR)" Date: Wed, 15 Jun 2016 11:11:37 -0700 Subject: Modify CrossGen test script to work around cmd.exe bug --- tests/src/CLRTest.CrossGen.targets | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests') 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 + ) ) ) ]]> -- cgit v1.2.3