diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets index 606c4a6cd7543..30102cca1544b 100644 --- a/src/tests/Common/CLRTest.CrossGen.targets +++ b/src/tests/Common/CLRTest.CrossGen.targets @@ -65,7 +65,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then cp $CORE_ROOT/lib*.so $CORE_ROOT/lib*.dylib $(scriptPath) else cp *.dll IL-CG2/ - rm IL-CG2/composite-r2r.dll + rm IL-CG2/composite-r2r.dll 2>/dev/null fi ExtraCrossGen2Args+=" $(CrossGen2TestExtraArguments)" @@ -77,10 +77,11 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then __cg2ExitCode=0 OneFileCrossgen2() { + date +%H:%M:%S __OutputFile=$1 __ResponseFile="$__OutputFile.rsp" - rm $__ResponseFile + rm $__ResponseFile 2>/dev/null __Command=$_DebuggerFullPath # Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path @@ -114,6 +115,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then __cg2ExitCode=$? export COMPlus_GCName COMPlus_GCStress COMPlus_HeapVerify COMPlus_ReadyToRun COMPlus_TC_OnStackReplacement COMPlus_TC_PartialCompilation + date +%H:%M:%S } if [ ! -z ${CompositeBuildMode+x} ]%3B then @@ -183,7 +185,7 @@ if defined RunCrossGen2 ( mkdir IL-CG2 copy *.dll IL-CG2\ - del IL-CG2\composite-r2r.dll + del IL-CG2\composite-r2r.dll 2>nul if defined CompositeBuildMode ( set ExtraCrossGen2Args=!ExtraCrossGen2Args! --composite @@ -208,8 +210,9 @@ if defined RunCrossGen2 ( goto :DoneCrossgen2Operations :CompileOneFileCrossgen2 + echo %time% set __ResponseFile=!__OutputFile!.rsp - del /Q !__ResponseFile! + del /Q !__ResponseFile! 2>nul set __Command=!_DebuggerFullPath! REM Tests run locally need __TestDotNetCmd (set by runtest.py) or a compatible 5.0 dotnet runtime in the path @@ -253,6 +256,7 @@ if defined RunCrossGen2 ( call !__Command! endlocal set CrossGen2Status=!ERRORLEVEL! + echo %time% Exit /b 0 :DoneCrossgen2Operations diff --git a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs index 976f542a6b21e..ad68f35537b92 100644 --- a/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs +++ b/src/tests/Common/CoreCLRTestLibrary/OutOfProcessTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. using System; @@ -71,6 +71,12 @@ public static void RunOutOfProcessTest(string basePath, string assemblyPath) testExecutable = Path.Combine(baseDir, Path.ChangeExtension(assemblyPath.Replace("\\", "/"), ".sh")); } + if (!File.Exists(testExecutable)) + { + // Skip platform-specific test when running on the excluded platform + return; + } + System.IO.Directory.CreateDirectory(outputDir); ret = wrapper.RunTest(testExecutable, outputFile, errorFile, Assembly.GetEntryAssembly()!.FullName!, testBinaryBase, outputDir); diff --git a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs index d0db16db340b5..213fc3d36d1bb 100644 --- a/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs +++ b/src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs @@ -338,15 +338,15 @@ public string WrapTestExecutionWithReporting(string testExecutionExpression, ITe builder.AppendLine($"System.TimeSpan testStart = stopwatch.Elapsed;"); builder.AppendLine("try {"); - builder.AppendLine($"System.Console.WriteLine(\"Running test: {{0}}\", {test.TestNameExpression});"); + builder.AppendLine($"System.Console.WriteLine(\"{{0:HH:mm:ss.fff}} Running test: {{1}}\", System.DateTime.Now, {test.TestNameExpression});"); builder.AppendLine($"{_outputRecorderIdentifier}.ResetTestOutput();"); builder.AppendLine(testExecutionExpression); builder.AppendLine($"{_summaryLocalIdentifier}.ReportPassedTest({test.TestNameExpression}, \"{test.ContainingType}\", @\"{test.Method}\", stopwatch.Elapsed - testStart, {_outputRecorderIdentifier}.GetTestOutput());"); - builder.AppendLine($"System.Console.WriteLine(\"Passed test: {{0}}\", {test.TestNameExpression});"); + builder.AppendLine($"System.Console.WriteLine(\"{{0:HH:mm:ss.fff}} Passed test: {{1}}\", System.DateTime.Now, {test.TestNameExpression});"); builder.AppendLine("}"); builder.AppendLine("catch (System.Exception ex) {"); builder.AppendLine($"{_summaryLocalIdentifier}.ReportFailedTest({test.TestNameExpression}, \"{test.ContainingType}\", @\"{test.Method}\", stopwatch.Elapsed - testStart, ex, {_outputRecorderIdentifier}.GetTestOutput());"); - builder.AppendLine($"System.Console.WriteLine(\"Failed test: {{0}}\", {test.TestNameExpression});"); + builder.AppendLine($"System.Console.WriteLine(\"{{0:HH:mm:ss.fff}} Failed test: {{1}}\", System.DateTime.Now, {test.TestNameExpression});"); builder.AppendLine("}"); builder.AppendLine("}"); diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 96d65ab0eabf5..582f8c7b7ae59 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -217,12 +217,17 @@ + DependsOnTargets="ResolveCMakeNativeProjectReference;ConsolidateNativeProjectReference" + BeforeTargets="Build"> - + + + + + - + PdbOnly true + true diff --git a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj index 2856022120ab8..da27e6f81deaf 100644 --- a/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/src/tests/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -13,6 +13,7 @@ true + true diff --git a/src/tests/issues.targets b/src/tests/issues.targets index caaae135a4f87..31c42e2e19fd5 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -1868,6 +1868,12 @@ https://github.com/dotnet/runtime/issues/34196 + + https://github.com/dotnet/runtime/issues/67756 + + + https://github.com/dotnet/runtime/issues/67756 + needs triage @@ -4007,6 +4013,8 @@ + diff --git a/src/tests/run.py b/src/tests/run.py index aab137bafa08f..b6a1565704eb7 100755 --- a/src/tests/run.py +++ b/src/tests/run.py @@ -844,8 +844,8 @@ def run_tests(args, if args.skip_test_run: return - # Set default per-test timeout to 15 minutes (in milliseconds). - per_test_timeout = 15*60*1000 + # Set default per-test timeout to 30 minutes (in milliseconds). + per_test_timeout = 30*60*1000 # Setup the environment if args.long_gc: