|
|
@@ -46,6 +46,9 @@ namespace RunTests
|
|
|
var appRuntimePath = $"{Options.DotnetRoot}/shared/Microsoft.AspNetCore.App/{Options.RuntimeVersion}";
|
|
|
Console.WriteLine($"Set ASPNET_RUNTIME_PATH: {appRuntimePath}");
|
|
|
EnvironmentVariables.Add("ASPNET_RUNTIME_PATH", appRuntimePath);
|
|
|
+ var dumpPath = Environment.GetEnvironmentVariable("HELIX_DUMP_FOLDER");
|
|
|
+ Console.WriteLine($"Set VSTEST_DUMP_PATH: {dumpPath}");
|
|
|
+ EnvironmentVariables.Add("VSTEST_DUMP_PATH", dumpPath);
|
|
|
|
|
|
#if INSTALLPLAYWRIGHT
|
|
|
// Playwright will download and look for browsers to this directory
|
|
|
@@ -211,7 +214,8 @@ namespace RunTests
|
|
|
{
|
|
|
// Timeout test run 5 minutes before the Helix job would timeout
|
|
|
var cts = new CancellationTokenSource(Options.Timeout.Subtract(TimeSpan.FromMinutes(5)));
|
|
|
- var commonTestArgs = $"test {Options.Target} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=15m\"";
|
|
|
+ var diagLog = Path.Combine(Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT"), "vstest.log");
|
|
|
+ var commonTestArgs = $"test {Options.Target} --diag:{diagLog} --logger:xunit --logger:\"console;verbosity=normal\" --blame \"CollectHangDump;TestTimeout=15m\"";
|
|
|
if (Options.Quarantined)
|
|
|
{
|
|
|
Console.WriteLine("Running quarantined tests.");
|
|
|
@@ -293,10 +297,10 @@ namespace RunTests
|
|
|
{
|
|
|
Console.WriteLine("No logs found in artifacts/log");
|
|
|
}
|
|
|
- Console.WriteLine($"Copying TestResults/**/*.dmp to {HELIX_WORKITEM_UPLOAD_ROOT}/");
|
|
|
+ Console.WriteLine($"Copying TestResults/**/Sequence*.xml to {HELIX_WORKITEM_UPLOAD_ROOT}/");
|
|
|
if (Directory.Exists("TestResults"))
|
|
|
{
|
|
|
- foreach (var file in Directory.EnumerateFiles("TestResults", "*.dmp", SearchOption.AllDirectories))
|
|
|
+ foreach (var file in Directory.EnumerateFiles("TestResults", "Sequence*.xml", SearchOption.AllDirectories))
|
|
|
{
|
|
|
var fileName = Path.GetFileName(file);
|
|
|
Console.WriteLine($"Copying: {file} to {Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, fileName)}");
|
|
|
@@ -305,7 +309,7 @@ namespace RunTests
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- Console.WriteLine("No dmps found in TestResults");
|
|
|
+ Console.WriteLine("No TestResults directory found.");
|
|
|
}
|
|
|
}
|
|
|
}
|