Skip to content

Commit 4c4547d

Browse files
Fix path to test reports in pipeline (#247)
* Fix path to test reports in pipeline * Fix test case when CPU starves, the thread 2 can run 14 ronuds.
1 parent 0d308c7 commit 4c4547d

File tree

3 files changed

+32
-14
lines changed

3 files changed

+32
-14
lines changed

.pipelines/smp.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ steps:
1919
filePath: '$(Build.SourcesDirectory)/scripts/sdl_check.sh'
2020

2121
- task: Bash@3
22-
displayName: 'Build SMP'
22+
displayName: 'Build'
2323
inputs:
2424
filePath: '$(Build.SourcesDirectory)/scripts/build_smp.sh'
2525

2626
- task: Bash@3
27-
displayName: 'Test SMP'
27+
displayName: 'Test'
2828
inputs:
2929
filePath: '$(Build.SourcesDirectory)/scripts/test_smp.sh'
3030

3131
- task: PublishTestResults@2
3232
condition: succeededOrFailed()
33-
displayName: 'Test SMP (PublishTestResults)'
33+
displayName: 'PublishTestResults'
3434
inputs:
3535
testResultsFormat: 'cTest'
3636
testResultsFiles: '*/Testing/**/*.xml'
@@ -40,14 +40,20 @@ steps:
4040

4141
- task: CopyFiles@2
4242
condition: succeededOrFailed()
43-
displayName: 'Test SMP (PublishTestReports)'
43+
displayName: 'CopyTestReports'
4444
inputs:
4545
SourceFolder: '$(Build.SourcesDirectory)/test/smp/cmake'
4646
Contents: |
4747
build/*.txt
4848
build/*/Testing/**/*.xml
4949
coverage_report/**/*
50-
TargetFolder: '$(ob_outputDirectory)/test_reports_SMP'
50+
TargetFolder: '$(build.artifactstagingdirectory)/test_reports_SMP'
51+
52+
- task: PublishBuildArtifacts@1
53+
condition: succeededOrFailed()
54+
displayName: 'PublishBuildArtifacts'
55+
inputs:
56+
pathToPublish: $(build.artifactstagingdirectory)
5157

5258
- task: PublishCodeCoverageResults@1
5359
condition: succeededOrFailed()
@@ -56,4 +62,3 @@ steps:
5662
codeCoverageTool: 'Cobertura'
5763
summaryFileLocation: '$(Build.SourcesDirectory)/test/smp/cmake/coverage_report/default_build_coverage.xml'
5864
pathToSources: '$(Build.SourcesDirectory)/test/smp/cmake'
59-
reportDirectory: '$(Build.SourcesDirectory)/test/smp/cmake/coverage_report/default_build_coverage'

.pipelines/tx.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ steps:
1919
filePath: '$(Build.SourcesDirectory)/scripts/sdl_check.sh'
2020

2121
- task: Bash@3
22-
displayName: 'Build TX'
22+
displayName: 'Build'
2323
inputs:
2424
filePath: '$(Build.SourcesDirectory)/scripts/build_tx.sh'
2525

2626
- task: Bash@3
27-
displayName: 'Test TX'
27+
displayName: 'Test'
2828
inputs:
2929
filePath: '$(Build.SourcesDirectory)/scripts/test_tx.sh'
3030

3131
- task: PublishTestResults@2
3232
condition: succeededOrFailed()
33-
displayName: 'Test TX (PublishTestResults)'
33+
displayName: 'PublishTestResults'
3434
inputs:
3535
testResultsFormat: 'cTest'
3636
testResultsFiles: '*/Testing/**/*.xml'
@@ -40,14 +40,20 @@ steps:
4040

4141
- task: CopyFiles@2
4242
condition: succeededOrFailed()
43-
displayName: 'Test TX (PublishTestReports)'
43+
displayName: 'CopyTestReports'
4444
inputs:
4545
SourceFolder: '$(Build.SourcesDirectory)/test/tx/cmake'
4646
Contents: |
4747
build/*.txt
4848
build/*/Testing/**/*.xml
4949
coverage_report/**/*
50-
TargetFolder: '$(ob_outputDirectory)/test_reports_TX'
50+
TargetFolder: '$(build.artifactstagingdirectory)/test_reports_TX'
51+
52+
- task: PublishBuildArtifacts@1
53+
condition: succeededOrFailed()
54+
displayName: 'PublishBuildArtifacts'
55+
inputs:
56+
pathToPublish: $(build.artifactstagingdirectory)
5157

5258
- task: PublishCodeCoverageResults@1
5359
condition: succeededOrFailed()
@@ -56,4 +62,3 @@ steps:
5662
codeCoverageTool: 'Cobertura'
5763
summaryFileLocation: '$(Build.SourcesDirectory)/test/tx/cmake/coverage_report/default_build_coverage.xml'
5864
pathToSources: '$(Build.SourcesDirectory)/test/tx/cmake'
59-
reportDirectory: '$(Build.SourcesDirectory)/test/tx/cmake/coverage_report/default_build_coverage'

test/tx/regression/threadx_event_flag_suspension_timeout_test.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,16 @@ UINT status;
179179
tx_thread_sleep(63);
180180

181181
/* Check the run counters. */
182-
if (((thread_1_counter != 32) && (thread_1_counter != 33)) || /* Depending on the starting time, thread 1 can run either 32 or 33 rounds. */
183-
(thread_2_counter != 13))
182+
if (((thread_1_counter != 32)
183+
#ifdef __linux__
184+
&& (thread_1_counter != 33) /* Depending on the starting time, thread 1 can run either 32 or 33 rounds. */
185+
#endif
186+
) ||
187+
((thread_2_counter != 13)
188+
#ifdef __linux__
189+
&& (thread_2_counter != 14) /* When CPU starves, the thread 2 can run 14 ronuds. */
190+
#endif
191+
))
184192
{
185193

186194
/* Event flag error. */

0 commit comments

Comments
 (0)