diff options
author | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 11:24:09 -0700 |
---|---|---|
committer | Russ Keldorph <russ.keldorph@microsoft.com> | 2017-05-22 13:30:31 -0700 |
commit | a16a8a852077b0c471cf12ef75dc5e8a41333533 (patch) | |
tree | dac36f93f17ea00ec6f704fd04c5251ef83210d0 /tests/src | |
parent | c41d51e46069b3b21b8a0361688e2557586f353c (diff) | |
download | coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.gz coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.tar.bz2 coreclr-a16a8a852077b0c471cf12ef75dc5e8a41333533.zip |
Revert "Fixed tests build on Linux"
Diffstat (limited to 'tests/src')
19 files changed, 40 insertions, 155 deletions
diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets index 34965a4efc..f95408f512 100644 --- a/tests/src/CLRTest.Execute.Bash.targets +++ b/tests/src/CLRTest.Execute.Bash.targets @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- *********************************************************************************************** CLRTest.Execute.Bash.targets @@ -84,7 +83,7 @@ fi ]]></BashCLRTestEnvironmentCompatibilityCheck> <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[ $(BashCLRTestEnvironmentCompatibilityCheck) -if [[ ( ! -z "$COMPlus_JitStress" ) || ( ! -z "$COMPlus_JitStressRegs" ) || ( ! -z "$COMPlus_JITMinOpts" ) || ( ! -z "$COMPlus_TailcallStress" ) ]] +if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ] then echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET" exit $(GCBashScriptExitCode) @@ -134,7 +133,7 @@ fi <Command><![CDATA[ export _DebuggerFullPath="${i#*=}" if [ ! -f "$_DebuggerFullPath" ] then - echo "The Debugger FullPath %5C%22${_DebuggerFullPath}%5C%22 does not exist" + echo The Debugger FullPath \"$_DebuggerFullPath\" doesn\'t exist usage fi]]></Command> <Description>Run testcases under debugger.</Description> @@ -291,6 +290,10 @@ CLRTestExpectedExitCode=0 <!-- Raise an error if any value in _RequiredProperties is missing --> <Error Condition=" '%(_RequiredProperties.Value)'=='' " Text="Missing required test property [%(_RequiredProperties.Identity)]. Something isn't plumbed through correctly. Contact $(_CLRTestBuildSystemOwner)." /> + <!-- TODO: this is weird. Consider eliminating it. --> + <GenerateParamList ArgumentItems="@(BashCLRTestExecutionScriptArgument)"> + <Output TaskParameter="ParamList" PropertyName="_CLRTestParamList"/> + </GenerateParamList> <PropertyGroup> <!-- This generates the script portion to parse all of the command line arguments. diff --git a/tests/src/CLRTest.Execute.targets b/tests/src/CLRTest.Execute.targets index 875c2fc5ba..b49785b9d6 100644 --- a/tests/src/CLRTest.Execute.targets +++ b/tests/src/CLRTest.Execute.targets @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <!-- *********************************************************************************************** CLRTest.Execute.targets @@ -97,7 +96,7 @@ This file contains the logic for providing Execution Script generation. --> <ItemGroup> - <ExecutionScriptKind Include="Batch" Condition="'$(BuildOS)' == 'Windows_NT'"/> + <ExecutionScriptKind Include="Batch" /> <ExecutionScriptKind Include="Bash" /> </ItemGroup> diff --git a/tests/src/CLRTest.Jit.targets b/tests/src/CLRTest.Jit.targets index b1da9fc0d7..1dd872c4af 100644 --- a/tests/src/CLRTest.Jit.targets +++ b/tests/src/CLRTest.Jit.targets @@ -23,11 +23,9 @@ WARNING: When setting properties based on their current state (for example: <Target Name="GetJitDisasmBashScript" Returns="$(JitDisasmBashScript)"> <PropertyGroup> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' != 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' == 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> - <JitDisasmOut Condition="'$(BuildOS)' != 'Windows_NT'">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/"))</JitDisasmOut> - <JitDisasmOut Condition="'$(BuildOS)' == 'Windows_NT'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut> + <JitDisasmOut>$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)).Replace("\","/"))</JitDisasmOut> <JitDisasmBashScript> <![CDATA[ # JitDisasm Script @@ -50,11 +48,9 @@ fi <Target Name="GetJitDisasmBatchScript" Returns="$(JitDisasmBatchScript)"> <PropertyGroup> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' != 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' == 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> - <JitDisasmOut Condition="'$(BuildOS)' != 'Windows_NT'">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(BaseOutputPathWithConfig.Replace("/","\\"))dasm\$(BuildProjectRelativeDir.Replace("/","\\"))).Replace("\\","/"))</JitDisasmOut> - <JitDisasmOut Condition="'$(BuildOS)' == 'Windows_NT'">$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut> + <JitDisasmOut>$([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)))</JitDisasmOut> <JitDisasmBatchScript> <![CDATA[ REM JitDisasm Script @@ -76,8 +72,7 @@ if defined RunningJitDisasm ( Name="GetIlasmRoundTripBashScript" Returns="$(IlasmRoundTripBashScript)"> <PropertyGroup> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' != 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath.Replace("/","\\")), $(_CLRTestToRunFileFullPath.Replace("/","\\"))).Replace("\\","/"))</InputAssemblyName> - <InputAssemblyName Condition="('$(CLRTestKind)' == 'RunOnly') and ('$(BuildOS)' == 'Windows_NT')">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)))</InputAssemblyName> + <InputAssemblyName Condition="'$(CLRTestKind)' == 'RunOnly'">$([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/"))</InputAssemblyName> <InputAssemblyName Condition="'$(CLRTestKind)' == 'BuildAndRun'">$(MSBuildProjectName).exe</InputAssemblyName> <DisassemblyName>$(MSBuildProjectName).dasm.il</DisassemblyName> <TargetAssemblyName>$(MSBuildProjectName).asm.exe</TargetAssemblyName> @@ -181,4 +176,4 @@ export COMPlus_GCStress=$(RunWithGcStress) </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj index 49e4f023da..e982e5f414 100644 --- a/tests/src/GC/LargeMemory/API/gc/memcheck.csproj +++ b/tests/src/GC/LargeMemory/API/gc/memcheck.csproj @@ -24,7 +24,7 @@ </ItemGroup> <ItemGroup> <!-- Add Compile Object Here --> - <Compile Include="memcheck.cs" /> + <Compile Include="MemCheck.cs" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj index 49e4f023da..e982e5f414 100644 --- a/tests/src/GC/LargeMemory/Allocation/memcheck.csproj +++ b/tests/src/GC/LargeMemory/Allocation/memcheck.csproj @@ -24,7 +24,7 @@ </ItemGroup> <ItemGroup> <!-- Add Compile Object Here --> - <Compile Include="memcheck.cs" /> + <Compile Include="MemCheck.cs" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/IL.targets b/tests/src/IL.targets index c63ce98ca6..36cff53035 100644 --- a/tests/src/IL.targets +++ b/tests/src/IL.targets @@ -11,12 +11,8 @@ Returns="" DependsOnTargets="$(CoreCompileDependsOn)"> <PropertyGroup> - <_ShellKeyMarker Condition="'$(BuildOS)' != 'Windows_NT'">-</_ShellKeyMarker> <!-- Work around ilasm comandline parser bugs... --> - <_ShellKeyMarker Condition="'$(BuildOS)' == 'Windows_NT'">/</_ShellKeyMarker> - <_ilasm>ilasm</_ilasm> - <_ilasm Condition="'$(CORE_ROOT)' != ''">$(CORE_ROOT)/ilasm</_ilasm> - <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">$(_ShellKeyMarker)DLL</_OutputTypeArgument> - <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">$(_ShellKeyMarker)EXE</_OutputTypeArgument> + <_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">/DLL</_OutputTypeArgument> + <_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">/EXE</_OutputTypeArgument> <_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches> <_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD</_IlasmSwitches> <_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) -STACK=$(SizeOfStackReserve)</_IlasmSwitches> @@ -26,7 +22,7 @@ <_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches> </PropertyGroup> - <Exec Command="$(_ilasm) $(_OutputTypeArgument) $(_ShellKeyMarker)OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)"> + <Exec Command="ilasm $(_OutputTypeArgument) /OUTPUT=@(IntermediateAssembly) $(_IlasmSwitches) @(Compile)"> <Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" /> </Exec> <Error Text="ILAsm failed" Condition="'$(_ILAsmExitCode)' != '0'" /> diff --git a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj index 144cfcee28..9fe1293674 100644 --- a/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj +++ b/tests/src/JIT/Directed/FaultHandlers/Simple/Simple.ilproj @@ -25,7 +25,7 @@ </ItemGroup> <PropertyGroup></PropertyGroup> <ItemGroup> - <Compile Include="simple.il" /> + <Compile Include="Simple.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj index 59f063e83f..ea51f6e203 100644 --- a/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj +++ b/tests/src/JIT/Directed/IL/PInvokeTail/TailWinApi.ilproj @@ -25,7 +25,7 @@ </ItemGroup> <PropertyGroup></PropertyGroup> <ItemGroup> - <Compile Include="tailwinapi.il" /> + <Compile Include="TailWinApi.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj index 62ffb83c94..7b74c279a9 100644 --- a/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj +++ b/tests/src/JIT/Directed/IL/Tailcall/JitTailcall2.ilproj @@ -27,7 +27,7 @@ <JitOptimizationSensitive>true</JitOptimizationSensitive> </PropertyGroup> <ItemGroup> - <Compile Include="Jittailcall2.il" /> + <Compile Include="JitTailcall2.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj index 793183d2dd..6e3f86137c 100644 --- a/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj +++ b/tests/src/JIT/Methodical/localloc/zeroinit/zeroInit01_large.ilproj @@ -25,7 +25,7 @@ </ItemGroup> <PropertyGroup></PropertyGroup> <ItemGroup> - <Compile Include="zeroinit01_large.il" /> + <Compile Include="zeroInit01_large.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj index 6bcb7a0da7..a009a89710 100644 --- a/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj +++ b/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04345/B04345.ilproj @@ -25,7 +25,7 @@ </ItemGroup> <PropertyGroup></PropertyGroup> <ItemGroup> - <Compile Include="b04345.il" /> + <Compile Include="B04345.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj index 7cff691baf..fc95236ff6 100644 --- a/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj +++ b/tests/src/JIT/jit64/localloc/zeroinit/zeroInit01_small.ilproj @@ -25,7 +25,7 @@ </ItemGroup> <PropertyGroup></PropertyGroup> <ItemGroup> - <Compile Include="zeroinit01_small.il" /> + <Compile Include="zeroInit01_small.il" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> diff --git a/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj index eacc9fc81c..5d417dcb07 100644 --- a/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj +++ b/tests/src/JIT/opt/Devirtualization/GitHub_9945.csproj @@ -10,7 +10,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/tests/src/JIT/opt/Devirtualization/comparable.csproj b/tests/src/JIT/opt/Devirtualization/comparable.csproj index 85825a98e5..780cd910ca 100644 --- a/tests/src/JIT/opt/Devirtualization/comparable.csproj +++ b/tests/src/JIT/opt/Devirtualization/comparable.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> diff --git a/tests/src/NuGet.Config b/tests/src/NuGet.Config index 7d6ce424cf..0922300baf 100644 --- a/tests/src/NuGet.Config +++ b/tests/src/NuGet.Config @@ -6,7 +6,6 @@ <packageSources> <clear/> <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <add key="myget.org dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> <add key="myget.org nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> </packageSources> diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index 2443e1c7e3..5a7ee2e83a 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> @@ -6,7 +5,7 @@ <PropertyGroup> <__BuildArch Condition="'$(__BuildArch)' == ''">x64</__BuildArch> <__BuildType Condition="'$(__BuildType)' == ''">Debug</__BuildType> - <__BuildOS Condition="'$(__BuildOS)' == ''">AnyOS</__BuildOS> + <__BuildOS Condition="'$(__BuildOS)' == ''">Windows_NT</__BuildOS> <BuildArch>$(__BuildArch)</BuildArch> <BuildType>$(__BuildType)</BuildType> <BuildOS>$(__BuildOS)</BuildOS> @@ -38,7 +37,7 @@ <PropertyGroup> <OSPlatformConfig>$(BuildOS).$(Platform).$(Configuration)</OSPlatformConfig> <BaseOutputPath>$(ProjectDir)\..\bin\tests</BaseOutputPath> - <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)</BaseOutputPath> + <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)\</BaseOutputPath> <BaseOutputPathWithConfig>$(BaseOutputPath)\$(OSPlatformConfig)\</BaseOutputPathWithConfig> <BinDir>$(BaseOutputPathWithConfig)</BinDir> <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath> diff --git a/tests/src/dir.props b/tests/src/dir.props index 0ccd6e9446..abad765fe4 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="dir.common.props" /> @@ -19,11 +18,11 @@ <!-- Expose the target OS in a more convenient fashion --> <PropertyGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('Windows'))">Windows_NT</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('Linux'))">Linux</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('OSX'))">OSX</OSGroup> - <OSGroup Condition="'$(OSGroup)'=='' and $(OSPlatformConfig.StartsWith('FreeBSD'))">FreeBSD</OSGroup> - <OSGroup Condition="'$(OSGroup)'==''">AnyOS</OSGroup> + <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Windows'))">Windows_NT</OSGroup> + <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('Linux'))">Linux</OSGroup> + <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('OSX'))">OSX</OSGroup> + <OSGroup Condition="'$(OSGroup)'=='' and $(Configuration.StartsWith('FreeBSD'))">FreeBSD</OSGroup> + <OSGroup Condition="'$(OSGroup)'==''">Windows_NT</OSGroup> </PropertyGroup> <!-- Setup properties per OSGroup --> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index 5b9082d282..4e6c618021 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Default priority building values. --> <PropertyGroup> @@ -104,8 +103,10 @@ <ProjectLanguage Condition="'$(MSBuildProjectExtension)' == '.csproj' OR '$(Language)' == 'C#' OR '$(ProjectLanguage)'==''">CSharp</ProjectLanguage> </PropertyGroup> + <!-- TODO (#1122): import this from the ToolsDir once it becomes available --> <Import Project="$(ProjectDir)src\IL.targets" Condition="'$(ProjectLanguage)' == 'IL' And '$(CLRTestPriority)' <= '$(CLRTestPriorityToBuild)'" /> + <Import Project="CLRTest.Execute.targets" /> <Target Name="CreateExecuteScript" AfterTargets="Build" @@ -146,13 +147,12 @@ Condition="'@(NativeProjectReferenceNormalized)' != ''" BeforeTargets="Build" > <ItemGroup> - <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))" Condition="'$(BuildOS)' != 'Windows_NT'" /> - <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\" Condition="'$(BuildOS)' == 'Windows_NT'" /> + <NativeProjectOutputFoldersToCopy Include="$([System.String]::Copy('%(NativeProjectReferenceNormalized.RelativeDir)').Replace($(SourceDir),$(__NativeTestIntermediatesDir)\src\))$(Configuration)\"/> </ItemGroup> <Message Text= "Full native project references are :%(NativeProjectReferenceNormalized.Identity)" /> <Message Text= "Native binaries will be copied from :%(NativeProjectOutputFoldersToCopy.Identity)" /> - <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != '' And '$(BuildOS)' == 'Windows_NT'" /> + <MSBuild Projects="$(MSBuildProjectFile)" Targets="CopyNativeProjectBinaries" Properties="NativeProjectOutputFolder=%(NativeProjectOutputFoldersToCopy.Identity)" Condition="'@(NativeProjectReference)' != ''" /> </Target> diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj index 215ce848dc..6ae2b7c09e 100644 --- a/tests/src/dirs.proj +++ b/tests/src/dirs.proj @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="VerifyBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="dir.props" /> @@ -15,10 +14,10 @@ <Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects" > <ItemGroup> - <DisabledProjects Include="TestWrappers*\**\*.csproj" /> + <DisabledProjects Include="TestWrappers*\*\*.csproj" /> <DisabledProjects Include="*\**\cs_template.csproj" /> - <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' != 'true') And ('$(BuildOS)' == 'Windows_NT')" /> - <DisabledProjects Include="Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="('$(BuildTestsAgainstPackages)' == 'true') Or ('$(BuildOS)' != 'Windows_NT')" /> + <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' != 'true'" /> + <DisabledProjects Include="Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" /> <DisabledProjects Include="Common\test_runtime\test_runtime.csproj" /> <DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" /> <DisabledProjects Include="Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> @@ -26,114 +25,11 @@ <DisabledProjects Include="Common\external\external.csproj" /> <DisabledProjects Include="Common\PerfHarness\PerfHarness.csproj" /> <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" /> - <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="('$(BuildTestsAgainstPackages)' == 'true') Or ('$(BuildOS)' != 'Windows_NT')" /> + <DisabledProjects Include="JIT\superpmi\superpmicollect.csproj" Condition="'$(BuildTestsAgainstPackages)' == 'true'" /> <DisabledProjects Include="JIT\config\**" /> <DisabledProjects Include="Performance\performance.csproj" /> <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" /> <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 --> - <DisabledProjects Include="JIT\Directed\nullabletypes\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Performance\CodeQuality\Span\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <!-- The following project requires System.Reflection.Emit which is not supported on Linux, see issue corefx@4491 --> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b67414\b67414.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <!-- The following projects cannot be compiled on Linux due to "csc.exe /debug:+" issue. Remove them after compiler will be fixed --> - <DisabledProjects Include="JIT\Directed\Misc\gettype\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\PREFIX\PrimitiveVT\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv1_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_d.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_do.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv2_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_d.ilproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\perffix\primitivevt\callconv3_il_r.ilproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\gettypetypeof\gettypetypeofmatrix.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\int64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint16_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint16_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint64Opt_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint64Opt_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint8_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Directed\shift\uint8_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Generics\Constraints\Call_instance01_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\Boxing\xlang\*.*" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\NaN\arithm32_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\NaN\arithm32_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\NaN\arithm64_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\NaN\arithm64_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_r.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\cctor\misc\throw_cs_ro.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\flowgraph\bug619534\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Methodical\stringintern\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M11-Beta1\b43313\b43313.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b51875\b51875.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b55197\b55197.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\V2.0-RTM\b491215\b491215.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\CLR-x86-JIT\v2.1\b152292\b152292.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\Dev11\External\Dev11_243742\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_1206929\DevDiv_1206929.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_142976\DevDiv_142976.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_150265\DevDiv_150265.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_168744\DevDiv_168744.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_200492\DevDiv_200492.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_255294\DevDiv_255294.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278365\DevDiv_278365.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278375\DevDiv_278375.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278376\DevDiv_278376.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_278526\DevDiv_278526.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280120\DevDiv_280120.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280123\DevDiv_280123.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_280127\DevDiv_280127.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_283795\DevDiv_283795.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_284785\DevDiv_284785.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\DevDiv_288222\DevDiv_288222.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10215\GitHub_10215.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10481\GitHub_10481.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10621\GitHub_10621.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10714\GitHub_10714.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1296\GitHub_1296.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_1323\GitHub_1323.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2580\GitHub_2580.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_2610\GitHub_2610.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_3449\GitHub_3449.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4044\GitHub_4044.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_4115\GitHub_4115.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5047\GitHub_5047.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_5696\GitHub_5696.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6238\GitHub_6238.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6239\GitHub_6239.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6318\GitHub_6318.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_6649\GitHub_6649.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7508\Vector3Test.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_7906\GitHub_7906.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8220\GitHub_8220.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8460\GitHub_8460.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_8599\GitHub_8599.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_9891\GitHub_9891.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10780\GitHub_10780.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_10940\GitHub_10940.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11343\GitHub_11343.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11408\GitHub_11408.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\Regression\JitBlue\GitHub_11733\GitHub_11733.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\jit64\eh\**\*.*" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\jit64\hfa\main\**\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\opt\virtualstubdispatch\manyintf\*.csproj" Condition="'$(RunningOnCore)' == 'true'" /> - <DisabledProjects Include="JIT\jit64\opt\cse\hugeexpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" /> - <DisabledProjects Include="JIT\jit64\opt\cse\HugeField2.csproj" Condition="'$(BuildOS)' == 'OSX'" /> - <DisabledProjects Include="JIT\jit64\opt\cse\hugeSimpleExpr1.csproj" Condition="'$(BuildOS)' == 'OSX'" /> - <DisabledProjects Include="Loader\classloader\generics\Instantiation\Nesting\NestedGenericStructs.csproj" Condition="'$(BuildOS)' == 'OSX'" /> </ItemGroup> <ItemGroup> |