diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml index 544e6c9ed29c2a5c9c481fdf07e633dc002e7a74..03288003d85f02a38166ab18c3beb60e3716f930 100644 --- a/eng/pipelines/common/templates/runtimes/run-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml @@ -300,7 +300,7 @@ jobs: # Compose the Core_Root folder containing all artifacts needed for running # CoreCLR tests. This step also compiles the framework using Crossgen / Crossgen2 # in ReadyToRun jobs. - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) generatelayoutonly $(logRootNameArg)Layout $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) generatelayoutonly $(logRootNameArg)Layout $(runtimeFlavorArgs) $(crossgenArg) $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(librariesOverrideArg) $(runtimeVariantArg) displayName: Generate CORE_ROOT # Build a Mono LLVM AOT cross-compiler for non-amd64 targets (in this case, just arm64) diff --git a/src/tests/Common/CLRTest.Execute.Bash.targets b/src/tests/Common/CLRTest.Execute.Bash.targets index fe56a45f80f244566a8e745617026b1b26a461fd..d2d04b567885d54c62d2f4ff73e1b87da471a548 100644 --- a/src/tests/Common/CLRTest.Execute.Bash.targets +++ b/src/tests/Common/CLRTest.Execute.Bash.targets @@ -306,8 +306,6 @@ $__Command msbuild $CORE_ROOT/wasm-test-runner/WasmTestRunner.proj /p:NetCoreApp + + $(OutputPath)/$(MSBuildProjectName).sh + + + endings before running the scripts on Unix platforms. In our current lab + infra it shouldn't really matter as the execution scripts are regenerated + in the 'test run' phase before sending the items to Helix i.o.w. at + the point where we already know the exact targeting platform. --> + diff --git a/src/tests/Common/CLRTest.Execute.Batch.targets b/src/tests/Common/CLRTest.Execute.Batch.targets index 963ce3eaea1603ea77706979eb8d7c317c82adc3..4fdd689bf0cb74b0e86bc09b6fdeb710c8e79127 100644 --- a/src/tests/Common/CLRTest.Execute.Batch.targets +++ b/src/tests/Common/CLRTest.Execute.Batch.targets @@ -301,8 +301,6 @@ COPY /y %CORE_ROOT%\CoreShim.dll . $(BatchLinkerTestLaunchCmds) $(BatchCopyCoreShimLocalCmds) -set TestExclusionListPath=%CORE_ROOT%\TestExclusionList.txt - IF NOT "%CLRCustomTestLauncher%"=="" ( set LAUNCHER=call %CLRCustomTestLauncher% %scriptPath% ) ELSE ( @@ -449,6 +447,7 @@ $(IlasmRoundTripBatchScript) REM Allow precommands to override the ExePath set ExePath=$(InputAssemblyName) +set TestExclusionListPath=%CORE_ROOT%\TestExclusionList.txt REM Precommands $(CLRTestBatchPreCommands) diff --git a/src/tests/Common/Directory.Build.targets b/src/tests/Common/Directory.Build.targets index 4f31cd9fc7646c4943dd2f76ababca235f11631b..79d1b9253c57b8368440a5010332262359778142 100644 --- a/src/tests/Common/Directory.Build.targets +++ b/src/tests/Common/Directory.Build.targets @@ -191,4 +191,7 @@ + + + diff --git a/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs b/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs index 70f9b7a1405878ad856396f221ba64131f24a159..c30c99f7e33061b27a0b2d3b5f24ffb7bb8d646d 100644 --- a/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs +++ b/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Text; using System.Threading.Tasks; using Microsoft.DotNet.XHarness.Common; using Microsoft.DotNet.XHarness.TestRunners.Common; @@ -15,16 +16,20 @@ public sealed class GeneratedTestRunner : TestRunner TestFilter.ISearchClause? _filter; Func _runTestsCallback; HashSet _testExclusionList; + private readonly Boolean _writeBase64TestResults; + public GeneratedTestRunner( LogWriter logger, Func runTestsCallback, string assemblyName, - HashSet testExclusionList) + HashSet testExclusionList, + bool writeBase64TestResults) :base(logger) { _assemblyName = assemblyName; _runTestsCallback = runTestsCallback; _testExclusionList = testExclusionList; + _writeBase64TestResults = writeBase64TestResults; ResultsFileName = $"{_assemblyName}.testResults.xml"; } @@ -53,7 +58,17 @@ public override string WriteResultsToFile(XmlResultJargon xmlResultJargon) public override void WriteResultsToFile(TextWriter writer, XmlResultJargon jargon) { Debug.Assert(jargon == XmlResultJargon.xUnit); - writer.WriteLine(LastTestRun.GetTestResultOutput(_assemblyName)); + string lastTestResults = LastTestRun.GetTestResultOutput(_assemblyName); + if (_writeBase64TestResults) + { + byte[] encodedBytes = Encoding.Unicode.GetBytes(lastTestResults); + string base64Results = Convert.ToBase64String(encodedBytes); + writer.WriteLine($"STARTRESULTXML {encodedBytes.Length} {base64Results} ENDRESULTXML"); + } + else + { + writer.WriteLine(lastTestResults); + } } public override void SkipTests(IEnumerable tests) diff --git a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs index bf1e624e5b8357545c0151869fe7ff341c18c557..b1b1f4e44e72ef618915df125356da4ff34856ac 100644 --- a/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs +++ b/src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs @@ -36,6 +36,12 @@ public static class RunnerEntryPoint bool anyFailedTests = false; entryPoint.TestsCompleted += (o, e) => anyFailedTests = e.FailedTests > 0; await entryPoint.RunAsync(); + + if (OperatingSystem.IsBrowser()) + { + // Browser expects all xharness processes to exit with 0, even in case of failure + return 0; + } return anyFailedTests ? 1 : 0; } @@ -65,7 +71,7 @@ sealed class AppleEntryPoint : iOSApplicationEntryPointBase protected override bool IsXunit => true; protected override TestRunner GetTestRunner(LogWriter logWriter) { - var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList); + var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList, writeBase64TestResults: true); if (_methodNameToRun is not null) { runner.SkipMethod(_methodNameToRun, isExcluded: false); @@ -103,7 +109,7 @@ sealed class AndroidEntryPoint : AndroidApplicationEntryPointBase protected override bool IsXunit => true; protected override TestRunner GetTestRunner(LogWriter logWriter) { - var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList); + var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList, writeBase64TestResults: false); if (_methodNameToRun is not null) { runner.SkipMethod(_methodNameToRun, isExcluded: false); @@ -151,7 +157,7 @@ sealed class WasmEntryPoint : WasmApplicationEntryPointBase protected override bool IsXunit => true; protected override TestRunner GetTestRunner(LogWriter logWriter) { - var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList); + var runner = new GeneratedTestRunner(logWriter, _runTestsCallback, _assemblyName, _testExclusionList, writeBase64TestResults: true); if (_methodNameToRun is not null) { runner.SkipMethod(_methodNameToRun, isExcluded: false); diff --git a/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs b/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs index a2f23bad9bbf8f42c64f76fd32ffd6f127d2721c..0de2af1ec838bfe21e6584e3f139a92bb915fe6b 100644 --- a/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs +++ b/src/tests/Common/XUnitWrapperLibrary/TestSummary.cs @@ -70,9 +70,10 @@ public string GetTestResultOutput(string assemblyName) foreach (var test in _testResults) { resultsFile.Append($@"" : string.Empty; if (test.Exception is not null) { - resultsFile.AppendLine($@"result=""Fail"">"); + resultsFile.AppendLine($@"result=""Fail"">{outputElement}"); } else if (test.SkipReason is not null) { @@ -80,7 +81,7 @@ public string GetTestResultOutput(string assemblyName) } else { - resultsFile.AppendLine($@" result=""Pass"">"); + resultsFile.AppendLine($@" result=""Pass"">{outputElement}"); } } diff --git a/src/tests/Common/helixpublishwitharcade.proj b/src/tests/Common/helixpublishwitharcade.proj index c1363a55d87fe8dd028912617913ca9d08bba6c0..4bf0fbd06046822798a92d29e7f3a0957cac3443 100644 --- a/src/tests/Common/helixpublishwitharcade.proj +++ b/src/tests/Common/helixpublishwitharcade.proj @@ -282,7 +282,8 @@ - <_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssembly" /> + + <_MergedWrapperMarker Include="$(TestBinDir)**\*.MergedTestAssembly" Exclude="$(TestBinDir)**\supportFiles\*.MergedTestAssembly" /> @@ -294,14 +295,22 @@ <_MergedWrapperRunScript Include="$([System.IO.Path]::ChangeExtension('%(_MergedWrapperMarker.Identity)', '.$(TestScriptExtension)'))" /> - <_MergedWrapperDirectory>%(_MergedWrapperRunScript.RootDir)%(Directory) + <_MergedWrapperDirectory>$([System.IO.Path]::GetDirectoryName('%(_MergedWrapperRunScript.Identity)')) + <_MergedWrapperParentDirectory>$([System.IO.Path]::GetDirectoryName('$(_MergedWrapperDirectory)')) <_MergedWrapperName>%(_MergedWrapperRunScript.FileName) <_MergedWrapperRunScriptRelative Condition="'%(_MergedWrapperRunScript.Identity)' != ''">$([System.IO.Path]::GetRelativePath($(TestBinDir), %(_MergedWrapperRunScript.FullPath))) + + <_MergedWrapperOutOfProcessTestMarkers Include="$(_MergedWrapperParentDirectory)/**/*.OutOfProcessTest" /> + <_MergedWrapperOutOfProcessTestFiles + Include="%(_MergedWrapperOutOfProcessTestMarkers.RootDir)%(_MergedWrapperOutOfProcessTestMarkers.Directory)/**" + Condition="'@(_MergedWrapperOutOfProcessTestMarkers)' != ''" /> + <_MergedPayloadGroups Include="$(_MergedWrapperName)" /> - <_MergedPayloadFiles Include="$(_MergedWrapperDirectory)**" /> + <_MergedPayloadFiles Include="$(_MergedWrapperDirectory)/**" /> + <_MergedPayloadFiles Include="@(_MergedWrapperOutOfProcessTestFiles)" /> <_MergedPayloadFiles Update="@(_MergedPayloadFiles)"> @@ -312,7 +321,7 @@ - + diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index a11b397670dab23c975adc38ccc16b48252a6f53..96d65ab0eabf502cd7c0c82e155e416cec0ee1ba 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -114,21 +114,6 @@ true - - - - - - - - - @@ -225,9 +210,26 @@ + - + + + + + + + + + @@ -259,20 +261,40 @@ - + + + + + + + + + File="$(IntermediateOutputPath)\$(MSBuildProjectName).MergedTestAssembly" + Lines="MergedTestAssembly" + Overwrite="true" + WriteOnlyWhenDifferent="true" /> + + + + + Lines="OutOfProcessTest" + Overwrite="true" + WriteOnlyWhenDifferent="true" /> diff --git a/src/tests/Exceptions/ForeignThread/ForeignThreadExceptions.csproj b/src/tests/Exceptions/ForeignThread/ForeignThreadExceptions.csproj index a4e1b468a2615cabade58e11020e7d1d153a2740..d282ce1b5191960e96936a68687f9cdab419ffad 100644 --- a/src/tests/Exceptions/ForeignThread/ForeignThreadExceptions.csproj +++ b/src/tests/Exceptions/ForeignThread/ForeignThreadExceptions.csproj @@ -1,6 +1,7 @@ Exe + true diff --git a/src/tests/Interop/DisabledRuntimeMarshalling/DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled.csproj b/src/tests/Interop/DisabledRuntimeMarshalling/DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled.csproj index b8914d641b733beeae1f022c88257a2aa8bbfb13..23d37e11f3adf60ce97c6908da01a6121a7ddd39 100644 --- a/src/tests/Interop/DisabledRuntimeMarshalling/DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled.csproj +++ b/src/tests/Interop/DisabledRuntimeMarshalling/DisabledRuntimeMarshalling_Disabled_NativeAssemblyEnabled.csproj @@ -1,6 +1,7 @@ true + true diff --git a/src/tests/Interop/SuppressGCTransition/SuppressGCTransitionTest.csproj b/src/tests/Interop/SuppressGCTransition/SuppressGCTransitionTest.csproj index abb1fec49b72268b30d8bc482a24340934d927e9..c08644530f62f56f741749456b0bcaa792d568d5 100644 --- a/src/tests/Interop/SuppressGCTransition/SuppressGCTransitionTest.csproj +++ b/src/tests/Interop/SuppressGCTransition/SuppressGCTransitionTest.csproj @@ -2,6 +2,7 @@ Exe True + true diff --git a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj index d7246c35374fcc5c677d0dd7cdce9cf0203ac740..5a5439c4127a504b9da271e1714027e017bb9a0a 100644 --- a/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj +++ b/src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.csproj @@ -2,6 +2,7 @@ Exe true + true diff --git a/src/tests/JIT/Directed/callconv/Directory.Build.props b/src/tests/JIT/Directed/callconv/Directory.Build.props new file mode 100644 index 0000000000000000000000000000000000000000..49b99b7a1019332a0bc834799633298d87e84cba --- /dev/null +++ b/src/tests/JIT/Directed/callconv/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + true + + \ No newline at end of file diff --git a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt index c17fe6fc4151493a0f26184b2ae2a559d5fc1b97..3b412d93042273619517dd7a25c9e3036aa79fdc 100644 --- a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt @@ -1,12 +1,4 @@ project(object_pin_mirror) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - add_library(mirror SHARED mirror.cpp) SET_TARGET_PROPERTIES(mirror PROPERTIES COMPILE_FLAGS "-c") - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS mirror DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(mirror PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/mirror) diff --git a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt index 7616aef865e5e05648819f20295744f3c3a4d1ec..48b0bfa1c4cf695b4cce241070ff47ad6b5fc73d 100644 --- a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt @@ -1,12 +1,4 @@ project(PInvokeExampleNative) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - add_library(PInvokeExampleNative SHARED pinvokeexamplenative.cpp) SET_TARGET_PROPERTIES(PInvokeExampleNative PROPERTIES COMPILE_FLAGS "-c") - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS PInvokeExampleNative DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(PInvokeExampleNative PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/PInvokeExampleNative) diff --git a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj index 2e1ffa2dcc1c7dc78d459252b21d7c30edb3abbf..e1a746da5ca68bf3f5be9e27900038eade2c91a7 100644 --- a/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj +++ b/src/tests/JIT/HardwareIntrinsics/General/Vector256_1/Vector256_1_r.csproj @@ -2,6 +2,7 @@ Exe true + true Embedded diff --git a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj index 6dbbc645a2d3187b31edb3ba6181065e0cf71d7d..85643608c575f3173fac32f50c4156f75255d939 100644 --- a/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj +++ b/src/tests/JIT/Methodical/ELEMENT_TYPE_IU/u_conv_il_r.ilproj @@ -1,6 +1,6 @@ - Exe + true PdbOnly diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj index 68ec24f2a5d6bc8e6a9b1c077eb381343cd8b77d..672ad9b544dd297d4ce696ceee5f092390e4523e 100644 --- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj +++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_d.ilproj @@ -1,6 +1,6 @@ - Exe + true Full diff --git a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj index b0ef594900714bff1dce4896f40559e6dfe2fb68..85b1aa395cdcd7994c73590a0ae8335589021b6b 100644 --- a/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj +++ b/src/tests/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_il_r.ilproj @@ -1,6 +1,6 @@ - Exe + true PdbOnly diff --git a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj index 790327597861e54ecc8e4dc7a82a85c85ecec52a..fe39c536a46d785431a80497a94f8a16b7d221c9 100644 --- a/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj +++ b/src/tests/JIT/Methodical/flowgraph/dev10_bug679008/helper.ilproj @@ -3,6 +3,7 @@ Library BuildOnly false + true Full diff --git a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt index 6ed3b60ff63bd4ff1875675045f73bf22d1586ef..b36677f461415c865df48fa03f2176bcb84b0697 100644 --- a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt +++ b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt @@ -1,12 +1,4 @@ project(jitstructtests) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - set(SOURCES structinregs.cpp structinregs.def) add_library(jitstructtests_lib SHARED ${SOURCES}) - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS jitstructtests_lib DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(jitstructtests_lib PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/structinregs) diff --git a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj index f9c3ccf6806776a2b4cde8ddcb3b07604bf7995b..33d8c00a50546c2e2f0ff230fb0cd0ac7a09a92f 100644 --- a/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj +++ b/src/tests/JIT/Performance/CodeQuality/Roslyn/CscBench.csproj @@ -3,6 +3,7 @@ Exe true $(NoWarn);xUnit1013 + true pdbonly diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt index 656e0b0df1f65d409098b10155b0ff4bd134c271..9226518586e3d59bdbcf8b16d8e16503f730d779 100644 --- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt +++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt @@ -1,12 +1,5 @@ project(b108129_test2) include_directories(${INC_PLATFORM_DIR}) -set(CMAKE_SHARED_LIBRARY_PREFIX "") add_library(test2 SHARED test2.cpp) SET_TARGET_PROPERTIES(test2 PROPERTIES COMPILE_FLAGS "-c") - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS test2 DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(test2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/test2) diff --git a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt index 2751523d47d3e5c55cb6af5a64fc1f327399fedd..57dda096197d670f8b13f94105a35da4f1478b5b 100644 --- a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt +++ b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt @@ -1,7 +1,5 @@ project(hfa_interop) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - add_library(hfa_simple_f32_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_simple_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT32") @@ -14,16 +12,3 @@ SET_TARGET_PROPERTIES(hfa_nested_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DN add_library(hfa_nested_f64_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_nested_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT64") - - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS hfa_simple_f32_native_cpp DESTINATION bin) -install(TARGETS hfa_simple_f64_native_cpp DESTINATION bin) -install(TARGETS hfa_nested_f32_native_cpp DESTINATION bin) -install(TARGETS hfa_nested_f64_native_cpp DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(hfa_simple_f32_native_cpp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/hfa_simple_f32_native_cpp) -set_target_properties(hfa_simple_f64_native_cpp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/hfa_simple_f64_native_cpp) -set_target_properties(hfa_nested_f32_native_cpp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/hfa_nested_f32_native_cpp) -set_target_properties(hfa_nested_f64_native_cpp PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/hfa_nested_f64_native_cpp) diff --git a/src/tests/JIT/jit64/localloc/ehverify/eh07_large.ilproj b/src/tests/JIT/jit64/localloc/ehverify/eh07_large.ilproj index 3339b7ce992bec53f0d00cb5833732c92a560130..d8e88df212c2d4ae25a408f03f9ef94002b8711f 100644 --- a/src/tests/JIT/jit64/localloc/ehverify/eh07_large.ilproj +++ b/src/tests/JIT/jit64/localloc/ehverify/eh07_large.ilproj @@ -2,6 +2,7 @@ Exe true + true PdbOnly diff --git a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt index f8abfa223caa1cfc78ccc3e71c0bf34aac4a0753..ca6502d07cc97a07cac35af83b80d98fcd714a92 100644 --- a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt +++ b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt @@ -1,7 +1,5 @@ project(mcc_native) -set(CMAKE_SHARED_LIBRARY_PREFIX "") - add_library(native_i0c SHARED native_i0c.cpp) add_library(native_i1c SHARED native_i1c.cpp) add_library(native_i3c SHARED native_i3c.cpp) @@ -17,39 +15,3 @@ add_library(native_i5s SHARED native_i5s.cpp) add_library(native_i6s SHARED native_i6s.cpp) add_library(native_i7s SHARED native_i7s.cpp) add_library(native_i8s SHARED native_i8s.cpp) - - - -# add the install targets (this "installs" the native file on Windows systems) -install(TARGETS native_i0c DESTINATION bin) -install(TARGETS native_i1c DESTINATION bin) -install(TARGETS native_i3c DESTINATION bin) -install(TARGETS native_i5c DESTINATION bin) -install(TARGETS native_i6c DESTINATION bin) -install(TARGETS native_i7c DESTINATION bin) -install(TARGETS native_i8c DESTINATION bin) - -install(TARGETS native_i0s DESTINATION bin) -install(TARGETS native_i1s DESTINATION bin) -install(TARGETS native_i3s DESTINATION bin) -install(TARGETS native_i5s DESTINATION bin) -install(TARGETS native_i6s DESTINATION bin) -install(TARGETS native_i7s DESTINATION bin) -install(TARGETS native_i8s DESTINATION bin) - -# This "installs" the native file on System V systems -set_target_properties(native_i0c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i0c) -set_target_properties(native_i1c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i1c) -set_target_properties(native_i3c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i3c) -set_target_properties(native_i5c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i5c) -set_target_properties(native_i6c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i6c) -set_target_properties(native_i7c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i7c) -set_target_properties(native_i8c PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i8c) - -set_target_properties(native_i0s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i0s) -set_target_properties(native_i1s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i1s) -set_target_properties(native_i3s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i3s) -set_target_properties(native_i5s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i5s) -set_target_properties(native_i6s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i6s) -set_target_properties(native_i7s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i7s) -set_target_properties(native_i8s PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/native_i8s) \ No newline at end of file diff --git a/src/tests/JIT/opt/virtualstubdispatch/bigvtbl/Directory.Build.props b/src/tests/JIT/opt/virtualstubdispatch/bigvtbl/Directory.Build.props new file mode 100644 index 0000000000000000000000000000000000000000..fb357e9d5c42edf83617b7dc409f2093c110b977 --- /dev/null +++ b/src/tests/JIT/opt/virtualstubdispatch/bigvtbl/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + true + + \ No newline at end of file diff --git a/src/tests/Loader/NativeLibs/FromNativePaths.csproj b/src/tests/Loader/NativeLibs/FromNativePaths.csproj index 9938c416fbd3946e54923c10d95af87a4b11139f..124ec1c036c8b24b10925856237a98c6a37dffad 100644 --- a/src/tests/Loader/NativeLibs/FromNativePaths.csproj +++ b/src/tests/Loader/NativeLibs/FromNativePaths.csproj @@ -4,6 +4,7 @@ true 1 + true diff --git a/src/tests/Loader/classloader/RefFields/Validate.csproj b/src/tests/Loader/classloader/RefFields/Validate.csproj index 89e9243940878a28b744b6cf4de87556b570253d..d25be953ff91f440533f3fcac6dff90d2144cad0 100644 --- a/src/tests/Loader/classloader/RefFields/Validate.csproj +++ b/src/tests/Loader/classloader/RefFields/Validate.csproj @@ -2,6 +2,7 @@ true Exe + true diff --git a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case03.csproj b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case03.csproj index 7308df24c65b7232ea6036c4a9882e772809cda3..09a937da38315d073bca3890285c80b5ff49313d 100644 --- a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case03.csproj +++ b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case03.csproj @@ -2,6 +2,7 @@ Exe enable + true diff --git a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case04.csproj b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case04.csproj index 6b6ec60a598c27c12d3a4f245733a8acf5f18fb6..f9048994f863ee875167d825a7dbb818e0793a5c 100644 --- a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case04.csproj +++ b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case04.csproj @@ -2,6 +2,7 @@ Exe enable + true diff --git a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case05.csproj b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case05.csproj index e84314924ecab0db064216e1974185a6f66ba6a3..1540275888e06336566397b1529b8bb415a1813d 100644 --- a/src/tests/Loader/classloader/explicitlayout/NestedStructs/case05.csproj +++ b/src/tests/Loader/classloader/explicitlayout/NestedStructs/case05.csproj @@ -2,6 +2,7 @@ Exe enable + true diff --git a/src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/Directory.Build.props b/src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/Directory.Build.props new file mode 100644 index 0000000000000000000000000000000000000000..fb357e9d5c42edf83617b7dc409f2093c110b977 --- /dev/null +++ b/src/tests/Loader/classloader/explicitlayout/objrefandnonobjrefoverlap/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + true + + \ No newline at end of file diff --git a/src/tests/baseservices/typeequivalence/simple/Simple.csproj b/src/tests/baseservices/typeequivalence/simple/Simple.csproj index e8bb27e9d97873b8ef0e169d74fed3ef555efaaa..37e57397b2c53adccab86737c2272e03267686d5 100644 --- a/src/tests/baseservices/typeequivalence/simple/Simple.csproj +++ b/src/tests/baseservices/typeequivalence/simple/Simple.csproj @@ -2,6 +2,7 @@ Exe True + true diff --git a/src/tests/build.proj b/src/tests/build.proj index 96682b6a7f1de8ea1705595533ab4541f1e55f48..c292d42fe4cf12f865129d121bda56304c8bd76d 100644 --- a/src/tests/build.proj +++ b/src/tests/build.proj @@ -109,7 +109,9 @@ - + + + @@ -121,7 +123,7 @@ - + @@ -396,6 +398,8 @@ + +