Skip to content

Commit 1bbc4ef

Browse files
authored
Outerloop enhancements (#8706)
Addendum to #8618
1 parent 0764bae commit 1bbc4ef

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.github/workflows/tests-outerloop.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
name: logs-runsheet
4040
path: |
41-
${{ github.workspace }}/artifacts/log/*/*.binlog
41+
${{ github.workspace }}/artifacts/log/*/runsheet.binlog
4242
${{ github.workspace }}/artifacts/log/*/TestLogs/**
4343
${{ github.workspace }}/artifacts/tmp/*/combined_runsheet.json
4444
retention-days: 5
@@ -100,6 +100,11 @@ jobs:
100100
}
101101
}
102102
103+
if ($testResults.Length -lt 1) {
104+
Write-Host "::notice::Tests Summary: no quaratined tests found"
105+
return;
106+
}
107+
103108
# Sort the test results by test name
104109
$testResults = $testResults | Sort-Object -Property TestName
105110
@@ -130,7 +135,7 @@ jobs:
130135
Write-Host "Test results saved to $outputPath"
131136
132137
- name: Upload logs, and test results
133-
if: failure()
138+
if: always()
134139
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
135140
with:
136141
name: logs-${{ matrix.tests.os }}-${{ matrix.tests.project }}

eng/QuarantinedTestRunsheetBuilder/QuarantinedTestRunsheetBuilder.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@
133133
<_TestRunnerLinux>./eng/build.sh</_TestRunnerLinux>
134134
<_TestCommand>-restore -build -test -projects &quot;$(_RelativeTestProjectPath)&quot; /bl:&quot;$(_RelativeTestBinLog)&quot; -c $(Configuration) -ci /p:RunQuarantinedTests=true /p:CI=false</_TestCommand>
135135

136+
<!--
137+
Some quarantinted test may only be executable on Windows or Linux, however we can't possibly know that at this time.
138+
The MTP runner will return exit code 8 if no tests are found, and we need to ignore it instead of failing the test.
139+
-->
140+
<_TestCommand>$(_TestCommand) /p:IgnoreZeroTestResult=true</_TestCommand>
141+
136142
<!-- Replace \ with /, and then escape " with \", so we have a compliant JSON -->
137143
<_TestCommand>$([System.String]::Copy($(_TestCommand)).Replace("\", "/").Replace('&quot;', '\&quot;'))</_TestCommand>
138144

eng/Testing.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<_BlameArgs>--hangdump --hangdump-timeout $(BlameHangTimeout) --crashdump</_BlameArgs>
2020

2121
<TestRunnerAdditionalArguments>$(TestRunnerAdditionalArguments) --filter-not-trait &quot;category=failing&quot;</TestRunnerAdditionalArguments>
22+
<TestRunnerAdditionalArguments Condition=" '$(IgnoreZeroTestResult)' == 'true' ">$(TestRunnerAdditionalArguments) --ignore-exit-code 8</TestRunnerAdditionalArguments>
2223

2324
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' != 'true'">$(TestRunnerAdditionalArguments) $(_NonQuarantinedTestRunAdditionalArgs) $(_BlameArgs)</TestRunnerAdditionalArguments>
2425
<TestRunnerAdditionalArguments Condition="'$(RunQuarantinedTests)' == 'true'">$(TestRunnerAdditionalArguments) $(_QuarantinedTestRunAdditionalArgs) $(_BlameArgs)</TestRunnerAdditionalArguments>

0 commit comments

Comments
 (0)