diff options
| author | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-09-14 15:57:36 -0700 |
|---|---|---|
| committer | RAMA KRISHNAN RAGHUPATHY <ramarag@rama.local> | 2016-09-15 23:31:55 -0700 |
| commit | 3e10b7622f5c7f80eab018e085b1328e35038fc7 (patch) | |
| tree | 082217a1c1cb27350c646e7876fae6efdcc1eea0 | |
| parent | 832a7498bf7aff89a70800c5f02517866f93dc1f (diff) | |
| download | coreclr-3e10b7622f5c7f80eab018e085b1328e35038fc7.tar.gz coreclr-3e10b7622f5c7f80eab018e085b1328e35038fc7.tar.bz2 coreclr-3e10b7622f5c7f80eab018e085b1328e35038fc7.zip | |
Enable Building Libraries for ilproj
| -rw-r--r-- | tests/src/dir.common.props | 5 | ||||
| -rw-r--r-- | tests/src/dir.props | 1 | ||||
| -rw-r--r-- | tests/src/dir.targets | 23 |
3 files changed, 15 insertions, 14 deletions
diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index 2e5bfd05a8..d5de5794d0 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -58,11 +58,6 @@ <TestRuntimeProjectLockJson>$(TestRuntimeProjectJsonDir)\project.lock.json</TestRuntimeProjectLockJson> </PropertyGroup> - <!-- Default priority building values. --> - <PropertyGroup> - <CLRTestKind Condition="'$(CLRTestKind)' == ' '">BuildAndRun</CLRTestKind> - <CLRTestPriority Condition="'$(CLRTestPriority)' == ''">0</CLRTestPriority> - </PropertyGroup> </Project> diff --git a/tests/src/dir.props b/tests/src/dir.props index 262feeaaaf..454db91dc4 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -10,7 +10,6 @@ <!-- Disable some C# warnings for the tests. --> <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <CLRTestKind>BuildAndRun</CLRTestKind> <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> <!-- Set the project.json directory for generated TestWrappers. --> <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 31d9304880..8235ba91a7 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,8 +1,23 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <!-- Default priority building values. --> + <PropertyGroup> + <CLRTestKind Condition="'$(CLRTestKind)' == '' and '$(OutputType)' == 'Library'">SharedLibrary</CLRTestKind> + <CLRTestKind Condition="'$(CLRTestKind)' == ''">BuildAndRun</CLRTestKind> + <CLRTestPriority Condition="'$(CLRTestPriority)' == ''">0</CLRTestPriority> + </PropertyGroup> + <!-- All CLRTests need to be of a certain "kind". These kinds are enumerated below. By default all tests are BuildAndRun. This means that the build system will Build them and construct a run-batch-script for them. --> <Choose> + <When Condition=" '$(CLRTestKind)'=='SharedLibrary'"> + <PropertyGroup> + <_CLRTestCompilesSource>true</_CLRTestCompilesSource> + <_CLRTestNeedsToRun>false</_CLRTestNeedsToRun> + <GenerateRunScript>false</GenerateRunScript> + <_CLRTestBuildsExecutable>false</_CLRTestBuildsExecutable> + </PropertyGroup> + </When> <When Condition=" '$(CLRTestKind)'=='BuildAndRun' "> <PropertyGroup> <GenerateRunScript>true</GenerateRunScript> @@ -28,14 +43,6 @@ <_CLRTestCompilesSource>false</_CLRTestCompilesSource> </PropertyGroup> </When> - <When Condition=" '$(CLRTestKind)'=='SharedLibrary' Or '$(OutputType)' == 'Library' "> - <PropertyGroup> - <_CLRTestCompilesSource>true</_CLRTestCompilesSource> - <_CLRTestNeedsToRun>false</_CLRTestNeedsToRun> - <GenerateRunScript>false</GenerateRunScript> - <_CLRTestBuildsExecutable>false</_CLRTestBuildsExecutable> - </PropertyGroup> - </When> </Choose> <PropertyGroup> |