diff options
| author | Bengu Li <beli@microsoft.com> | 2015-02-12 16:03:39 -0800 |
|---|---|---|
| committer | Bengu Li <beli@microsoft.com> | 2015-02-12 16:03:39 -0800 |
| commit | 2b054da5b0f0740c92f6bdd3c9093644a0a7cfb7 (patch) | |
| tree | c58c6775f0aa29418ca030567a7064a2733c9e09 | |
| parent | 8c6dd79fb18a803b96ebef9bd3ea263907886b4b (diff) | |
| download | coreclr-2b054da5b0f0740c92f6bdd3c9093644a0a7cfb7.tar.gz coreclr-2b054da5b0f0740c92f6bdd3c9093644a0a7cfb7.tar.bz2 coreclr-2b054da5b0f0740c92f6bdd3c9093644a0a7cfb7.zip | |
Expand the availability of MSILC JIT to all tests
| -rw-r--r-- | tests/runtest.cmd | 2 | ||||
| -rw-r--r-- | tests/src/JIT/CodeGenBringUpTests/cs_template.proj | 3 | ||||
| -rw-r--r-- | tests/src/JIT/Directed/Arrays/cs_template.proj | 3 | ||||
| -rw-r--r-- | tests/src/dir.props | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 889b3c073f..048f874f81 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -8,6 +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" == "EnableMSILC" (set __EnableMSILC=true&shift&goto Arg_Loop) if /i "%1" == "/?" (goto Usage) @@ -132,6 +133,7 @@ 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 EnableMSILC- Optional parameter this will use MSILC JIT, an alternative JIT for testing echo CORE_ROOT The path to the runtime goto :eof diff --git a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj b/tests/src/JIT/CodeGenBringUpTests/cs_template.proj index e283ed6a29..93788b357b 100644 --- a/tests/src/JIT/CodeGenBringUpTests/cs_template.proj +++ b/tests/src/JIT/CodeGenBringUpTests/cs_template.proj @@ -21,9 +21,6 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> - <PropertyGroup> - <_CLRTestPreCommands>IF NOT "%DOMSILCTEST%"=="" set COMPLus_AltJit=*;IF NOT "%DOMSILCTEST%"=="" set COMPLus_AltJitName=MSILCJit.dll</_CLRTestPreCommands> - </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> <Visible>False</Visible> diff --git a/tests/src/JIT/Directed/Arrays/cs_template.proj b/tests/src/JIT/Directed/Arrays/cs_template.proj index e283ed6a29..93788b357b 100644 --- a/tests/src/JIT/Directed/Arrays/cs_template.proj +++ b/tests/src/JIT/Directed/Arrays/cs_template.proj @@ -21,9 +21,6 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> </PropertyGroup> - <PropertyGroup> - <_CLRTestPreCommands>IF NOT "%DOMSILCTEST%"=="" set COMPLus_AltJit=*;IF NOT "%DOMSILCTEST%"=="" set COMPLus_AltJitName=MSILCJit.dll</_CLRTestPreCommands> - </PropertyGroup> <ItemGroup> <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies"> <Visible>False</Visible> diff --git a/tests/src/dir.props b/tests/src/dir.props index f3f8c6e6b1..c8f86c4345 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -9,5 +9,9 @@ <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute> </PropertyGroup> - + <!-- Enable MSILC JIT for testing if specified --> + <PropertyGroup> + <_CLRTestPreCommands>IF NOT "%__EnableMSILC%"=="" set COMPLus_AltJit=*;IF NOT "%__EnableMSILC%"=="" set COMPLus_AltJitName=MSILCJit.dll</_CLRTestPreCommands> + </PropertyGroup> + </Project> |