Skip to content

Add runtime test logs to HELIX_WORKITEM_UPLOAD_ROOT #53798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2021
+33 −5
Merged

Add runtime test logs to HELIX_WORKITEM_UPLOAD_ROOT #53798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.Execute.Bash.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ else
HARNESS_RUNNER="xharness"
fi

$__Command $HARNESS_RUNNER android test --instrumentation="net.dot.MonoRunner" --package-name="net.dot.$__Category" --app="$__TestBinaryBase/$__Category.apk" --output-directory=`$HELIX_WORKITEM_UPLOAD_ROOT` --arg=entrypoint:libname=$(MsBuildProjectName).dll --expected-exit-code=100 -v
$__Command $HARNESS_RUNNER android test --instrumentation="net.dot.MonoRunner" --package-name="net.dot.$__Category" --app="$__TestBinaryBase/$__Category.apk" --output-directory="$__OutputDir" --arg=entrypoint:libname=$(MsBuildProjectName).dll --expected-exit-code=100 -v
CLRTestExitCode=$?

# Exist code of xharness is zero when tests finished successfully
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Common/CLRTest.Execute.Batch.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ IF NOT "%XHARNESS_CLI_PATH%"=="" (
set HARNESS_RUNNER=xharness
)

%__Command% %HARNESS_RUNNER% android test --instrumentation="net.dot.MonoRunner" --package-name="net.dot.%__Category%" --app="%__TestBinaryBase%\%__Category%.apk" --output-directory="%HELIX_WORKITEM_UPLOAD_ROOT%" --arg=entrypoint:libname=$(MsBuildProjectName).dll --expected-exit-code=100 -v
%__Command% %HARNESS_RUNNER% android test --instrumentation="net.dot.MonoRunner" --package-name="net.dot.%__Category%" --app="%__TestBinaryBase%\%__Category%.apk" --output-directory="%__OutputDir%" --arg=entrypoint:libname=$(MsBuildProjectName).dll --expected-exit-code=100 -v
set CLRTestExitCode=!ERRORLEVEL!
set CLRTestExpectedExitCode=0
]]></BatchCLRTestLaunchCmds>
Expand Down
3 changes: 2 additions & 1 deletion src/tests/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static unsafe IEnumerable<Process> FindChildProcessesByName(Process process, str
return children;
}

public int RunTest(string executable, string outputFile, string errorFile, string category, string testBinaryBase)
public int RunTest(string executable, string outputFile, string errorFile, string category, string testBinaryBase, string outputDir)
{
Debug.Assert(outputFile != errorFile);

Expand Down Expand Up @@ -321,6 +321,7 @@ public int RunTest(string executable, string outputFile, string errorFile, strin
process.StartInfo.RedirectStandardError = true;
process.StartInfo.EnvironmentVariables.Add("__Category", category);
process.StartInfo.EnvironmentVariables.Add("__TestBinaryBase", testBinaryBase);
process.StartInfo.EnvironmentVariables.Add("__OutputDir", outputDir);

DateTime startTime = DateTime.Now;
process.Start();
Expand Down
31 changes: 29 additions & 2 deletions src/tests/run.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,25 @@ $(_XunitEpilog)
<PackageReference Include="Microsoft.DotNet.XUnitConsoleRunner" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" />
</ItemGroup>

<ItemGroup>
<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

</Project>
]]>
</XunitWrapperGenCsProj>
<XunitRunnerConfig>
<![CDATA[
{
"diagnosticMessages": true,
"longRunningTestSeconds": 120,
"shadowCopy": false,
"preEnumerateTheories": false
}
]]>
</XunitRunnerConfig>
</PropertyGroup>

<!-- <Exec Command="md" -->
Expand All @@ -141,6 +155,12 @@ $(_XunitEpilog)
File="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj"
Lines="$(XunitWrapperGenCsProj)"
Overwrite="true" />

<!-- Write the file -->
<WriteLinesToFile
File="$(XunitWrapperSrcDir)\xunit.runner.json"
Lines="$(XunitRunnerConfig)"
Overwrite="true" />
</Target>

<Target Name="BuildXunitWrapper">
Expand Down Expand Up @@ -184,13 +204,18 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
internal static string testBinaryBase%3B
internal static string coreRoot%3B
internal static string category%3B
internal static string helixUploadRoot%3B

static _Global()
{
reportBase = System.Environment.GetEnvironmentVariable(%22XunitTestReportDirBase%22)%3B
testBinaryBase = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)%3B
coreRoot = System.Environment.GetEnvironmentVariable(%22CORE_ROOT%22)%3B
category = "$([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").Replace("-","_"))"%3B
helixUploadRoot = System.Environment.GetEnvironmentVariable(%22HELIX_WORKITEM_UPLOAD_ROOT%22)%3B
if (!String.IsNullOrEmpty(helixUploadRoot)) {
reportBase = System.IO.Path.Combine(System.IO.Path.GetFullPath(helixUploadRoot), "Reports")%3B
}

if (String.IsNullOrEmpty(reportBase)) {
reportBase = System.IO.Path.Combine(testBinaryBase, "Reports")%3B
Expand Down Expand Up @@ -266,6 +291,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
string outputFile = null%3B
string errorFile = null%3B
string testExecutable = null%3B
string outputDir = null%3B
Exception infraEx = null%3B

try
Expand All @@ -276,14 +302,15 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
errorFile = System.IO.Path.GetFullPath(_Global.reportBase + testSubfolder + @"%(AllCMDs.FileName).error.txt")%3B
testExecutable = System.IO.Path.GetFullPath(_Global.testBinaryBase + @"$([System.String]::Copy('%(AllCMDs.FullPath)').Replace("$(_CMDDIR)",''))")%3B
$(TestExecutableReplacement)
outputDir = System.IO.Path.GetDirectoryName(outputFile)%3B

if (!_Global.runningInWindows) {
testExecutable = testExecutable.Replace(".cmd", ".sh")%3B
}

System.IO.Directory.CreateDirectory(_Global.reportBase + testSubfolder)%3B

ret = wrapper.RunTest(testExecutable, outputFile, errorFile, _Global.category, _Global.testBinaryBase)%3B
ret = wrapper.RunTest(testExecutable, outputFile, errorFile, _Global.category, _Global.testBinaryBase, outputDir)%3B
}
catch (Exception ex)
{
Expand Down Expand Up @@ -345,7 +372,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
// Add Android app running log to testOutput
if (ret != CoreclrTestWrapperLib.EXIT_SUCCESS_CODE)
{
string androidLogFile = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(testExecutable), "adb-logcat-net.dot." + _Global.category + ".log")%3B
string androidLogFile = System.IO.Path.Combine(outputDir, "adb-logcat-net.dot." + _Global.category + "-net.dot.MonoRunner.log")%3B
if(File.Exists(androidLogFile))
{
testOutput.AddRange(System.IO.File.ReadAllLines(androidLogFile))%3B
Expand Down