From b5bcd2703228e083d1ba2ef8948b31c04fe87b3f Mon Sep 17 00:00:00 2001 From: Bengu Li Date: Sun, 22 Feb 2015 13:28:45 -0800 Subject: [PATCH] Allow alternative JIT configurable. --- tests/runtest.cmd | 7 ++++--- tests/src/dir.props | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 37ab137..8ef43dd 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -8,7 +8,7 @@ if /i "%1" == "x64" (set __BuildArch=x64&set __MSBuildBuildArch=x64&shift&got if /i "%1" == "debug" (set __BuildType=debug&shift&goto Arg_Loop) if /i "%1" == "release" (set __BuildType=release&shift&goto Arg_Loop) if /i "%1" == "SkipWrapperGeneration" (set __SkipWrapperGeneration=true&shift&goto Arg_Loop) -if /i "%1" == "EnableLLILC" (set __EnableLLILC=true&shift&goto Arg_Loop) +if /i "%1" == "EnableAltJit" (set __EnableAltJit=true&set Alt_Jit_Name=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/?" (goto Usage) @@ -54,6 +54,7 @@ set Core_Root=%__BinDir% if not exist %XunitTestBinBase% echo Error: Ensure the Test Binaries are built and are present at %XunitTestBinBase%, Run - buildtest.cmd %__BuildArch% %__BuildType% to build the tests first. && exit /b 1 if "%Core_Root%" == "" echo Error: Ensure you have done a successful build of the Product and Run - runtest BuildArch BuildType {path to product binaries}. && exit /b 1 if not exist %Core_Root%\coreclr.dll echo Error: Ensure you have done a successful build of the Product and %Core_Root% contains runtime binaries. && exit /b 1 +if defined __EnableAltJit (if not exist %Core_Root%\%Alt_Jit_Name%.dll echo Error: Ensure alternative JIT %Alt_Jit_Name%.dll exist in %Core_Root%. && exit /b 1) if not exist %__LogsDir% md %__LogsDir% :SkipDefaultCoreRootSetup @@ -128,12 +129,12 @@ goto :eof :Usage echo. echo Usage: -echo %0 BuildArch BuildType [SkipWrapperGeneration] [EnableLLILC] CORE_ROOT where: +echo %0 BuildArch BuildType [SkipWrapperGeneration] [EnableAltJit ALT_JIT_NAME] CORE_ROOT where: echo. echo BuildArch is x64 echo BuildType can be: Debug, Release echo SkipWrapperGeneration- Optional parameter this will run the same set of tests as the last time it was run -echo EnableLLILC- Optional parameter this will use LLILC JIT, an alternative JIT for testing +echo EnableAltJit- Optional parameter this will use alternative JIT specified by ALT_JIT_NAME for testing echo CORE_ROOT The path to the runtime goto :eof diff --git a/tests/src/dir.props b/tests/src/dir.props index 6542e09..13dca4c 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -9,9 +9,9 @@ false - + - <_CLRTestPreCommands>IF NOT "%__EnableLLILC%"=="" set COMPLus_AltJit=*;IF NOT "%__EnableLLILC%"=="" set COMPLus_AltJitName=LLILCJit.dll + <_CLRTestPreCommands>IF NOT "%__EnableAltJit%"=="" set COMPLus_AltJit=*;IF NOT "%__EnableAltJit%"=="" set COMPLus_AltJitName=%Alt_Jit_Name%.dll -- 2.7.4