Skip to content

Commit bd4c331

Browse files
authored
CSHARP-4444: Display all tests results in EG (#1210)
1 parent 680cb4e commit bd4c331

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

build.cake

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,8 @@ Task("SmokeTests")
512512
toolSettings);
513513

514514
RunTests(
515-
buildConfig,
516-
testProject,
515+
buildConfig,
516+
testProject,
517517
settings =>
518518
{
519519
settings.NoBuild = false;
@@ -753,8 +753,8 @@ Setup<BuildConfig>(
753753
var packageVersion = lowerTarget.StartsWith("smoketests") ? gitVersion.FullSemVer.Replace('+', '-') : gitVersion.LegacySemVer;
754754

755755
Console.WriteLine($"Framework: {framework ?? "null (not set)"}, TargetPlatform: {targetPlatform}, IsReleaseMode: {isReleaseMode}, PackageVersion: {packageVersion}");
756-
var loggers = CreateLoggers();
757-
return new BuildConfig(isReleaseMode, framework, targetPlatform, packageVersion, loggers);
756+
757+
return new BuildConfig(isReleaseMode, framework, targetPlatform, packageVersion);
758758
});
759759

760760
RunTarget(target);
@@ -765,25 +765,24 @@ public class BuildConfig
765765
public string Framework { get; }
766766
public string PackageVersion { get; }
767767
public string TargetPlatform { get; }
768-
public string[] Loggers { get; }
769768

770-
public BuildConfig(bool isReleaseMode, string framework, string targetPlatform, string packageVersion, string[] loggers)
769+
public BuildConfig(bool isReleaseMode, string framework, string targetPlatform, string packageVersion)
771770
{
772771
IsReleaseMode = isReleaseMode;
773772
Framework = framework;
774773
TargetPlatform = targetPlatform;
775774
PackageVersion = packageVersion;
776-
Loggers = loggers;
777775
}
778776
}
779777

780-
string[] CreateLoggers()
778+
string[] CreateLoggers(string projectName)
781779
{
782-
var testResultsFile = outputDirectory.Combine("test-results").Combine($"TEST-{target.ToLowerInvariant()}-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}.xml");
780+
var testResultsFile = outputDirectory.Combine("test-results").Combine($"TEST-{projectName}-{target.ToLowerInvariant()}-{DateTimeOffset.UtcNow.ToUnixTimeMilliseconds()}.xml");
781+
783782
// Evergreen CI server requires JUnit output format to display test results
784783
var junitLogger = $"junit;LogFilePath={testResultsFile};FailureBodyFormat=Verbose";
785784
var consoleLogger = "console;verbosity=detailed";
786-
return new []{ junitLogger, consoleLogger };
785+
return new[] { junitLogger, consoleLogger };
787786
}
788787

789788
void RunTests(BuildConfig buildConfig, Path path, string filter = null)
@@ -793,16 +792,18 @@ void RunTests(BuildConfig buildConfig, Path path, string filter = null)
793792

794793
void RunTests(BuildConfig buildConfig, Path path, Action<DotNetTestSettings> settingsAction)
795794
{
795+
var projectName = System.IO.Path.GetFileNameWithoutExtension(path.FullPath);
796+
796797
var settings = new DotNetTestSettings
797798
{
798799
NoBuild = true,
799800
NoRestore = true,
800801
Configuration = configuration,
801-
Loggers = buildConfig.Loggers,
802+
Loggers = CreateLoggers(projectName),
802803
ArgumentCustomization = args => args.Append($"-- RunConfiguration.TargetPlatform={buildConfig.TargetPlatform}"),
803804
Framework = buildConfig.Framework
804805
};
805-
806+
806807
settingsAction?.Invoke(settings);
807808

808809
DotNetTest(path.FullPath, settings);

0 commit comments

Comments
 (0)