diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-04-25 15:40:22 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-04-25 15:41:22 -0700 |
| commit | a057c4c7ed485a502fca0031426155014bfa13de (patch) | |
| tree | 06a8544157ddb0cd5b631ea4705af4251cf328f6 /tests/helixprep.proj | |
| parent | 6aa4c7b92ea3daca9012045bd5fd7b864f2ac2ad (diff) | |
| download | coreclr-a057c4c7ed485a502fca0031426155014bfa13de.tar.gz coreclr-a057c4c7ed485a502fca0031426155014bfa13de.tar.bz2 coreclr-a057c4c7ed485a502fca0031426155014bfa13de.zip | |
Set RunCrossGen=true for non-Windows R2R runs
Diffstat (limited to 'tests/helixprep.proj')
| -rw-r--r-- | tests/helixprep.proj | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/helixprep.proj b/tests/helixprep.proj index 678006b13a..22c5935ce1 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -74,7 +74,7 @@ Condition="'$(TargetsWindows)' == 'true' "> <PropertyGroup> - <CrossgenVar Condition="'$(Crossgen)' == 'true'">set RunCrossGen=true</CrossgenVar> + <CmdCrossgenVar Condition="'$(Crossgen)' == 'true'">set RunCrossGen=true</CrossgenVar> <WrapperCmdContents> <![CDATA[ @ECHO OFF @@ -82,7 +82,7 @@ setlocal ENABLEDELAYEDEXPANSION pushd %~dp0 set CORE_ROOT=%HELIX_CORRELATION_PAYLOAD% -$(CrossgenVar) +$(CmdCrossgenVar) ECHO BEGIN EXECUTION ECHO %HELIX_CORRELATION_PAYLOAD%\CoreRun.exe %HELIX_WORKITEM_PAYLOAD%\xunit.console.netcore.exe %HELIX_WORKITEM_PAYLOAD%\$(ProjectName) -noshadow -xml testResults.xml -notrait category=outerloop -notrait category=failing @@ -121,6 +121,7 @@ EXIT /B %ERRORLEVEL% <!-- Crossgen FX assemblies, if running R2R tests. TODO - remove this when we build tests on Linux --> + <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)export RunCrossGen=true%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)overlayDir=%24CORE_ROOT%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents)if [ ! -f %24overlayDir/crossgenCompleted.mrk ]%3B then%0a</WrapperShContents> <WrapperShContents Condition="'$(Crossgen)' == 'true'">$(WrapperShContents) filesToPrecompile=%24(find -L %24overlayDir -iname \%2A.dll -not -iname \%2A.ni.dll -not -iname \%2A-ms-win-\%2A -type f )%0a</WrapperShContents> |