From 8d7c62c1a67835bac53a8fa86f95e58fb9b35360 Mon Sep 17 00:00:00 2001 From: Swaroop Sridhar Date: Wed, 4 Mar 2015 17:27:48 -0800 Subject: [PATCH] Enable use of Conservative GC for LLILC Testing This change has two parts: (1) Pass ALTJIT settings via the LLILCTestEnv.cmd script, to match the change in CoreClr test infrastructure. (2) Run CoreCLR in Conservative GC mode for LLILC tests. Testing: LLILC Tests passed locally This change fixes Issue# 27 --- test/LLILCEnv.ps1 | 4 ++-- test/LLILCTestEnv.cmd | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 test/LLILCTestEnv.cmd diff --git a/test/LLILCEnv.ps1 b/test/LLILCEnv.ps1 index 34b3236..6c0f239 100644 --- a/test/LLILCEnv.ps1 +++ b/test/LLILCEnv.ps1 @@ -780,6 +780,7 @@ function Global:RunTest([string]$Arch="x64", [string]$Build="Release") $CoreCLRTestAssets = CoreCLRTestAssets $CoreCLRRuntime = CoreCLRRuntime $CoreCLRVersion = CoreCLRVersion + $LLILCTest = LLILCTest # Workaround exception handling issue chcp 65001 | Out-Null @@ -787,8 +788,7 @@ function Global:RunTest([string]$Arch="x64", [string]$Build="Release") $Env:SkipTestAssemblies = "Common;Exceptions;GC;Loader;managed;packages;Regressions;runtime;Tests;TestWrappers_x64_release;Threading" pushd . cd $CoreCLRTestAssets\coreclr\tests - - .\runtest $Arch $Build EnableAltJit LLILCJit $CoreCLRRuntime\$CoreCLRVersion\bin | Write-Host + .\runtest $Arch $Build TestEnv $LLILCTest\LLILCTestEnv.cmd $CoreCLRRuntime\$CoreCLRVersion\bin | Write-Host $NumDiff = CheckDiff -Create $True -UseDiffTool $False -Arch $Arch -Build $Build $NumFailures = CheckFailure -Arch $Arch -Build $Build popd diff --git a/test/LLILCTestEnv.cmd b/test/LLILCTestEnv.cmd new file mode 100644 index 0000000..cf273db --- /dev/null +++ b/test/LLILCTestEnv.cmd @@ -0,0 +1,9 @@ +REM ------------------------------------------------------------------------- +REM +REM This script provides LLILC test environment settings +REM +REM ------------------------------------------------------------------------- + +set COMPLUS_AltJit=* +set COMPLUS_AltJitName=LLILCJit.dll +set COMPLUS_GCCONSERVATIVE=1