From 4c4547d5d5a837fbc5ed0f8ba3315792da732f2a Mon Sep 17 00:00:00 2001
From: TiejunZhou <50469179+TiejunMS@users.noreply.github.com>
Date: Mon, 17 Apr 2023 09:40:59 +0800
Subject: [PATCH] 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.
---
 .pipelines/smp.yml                              | 17 +++++++++++------
 .pipelines/tx.yml                               | 17 +++++++++++------
 ...threadx_event_flag_suspension_timeout_test.c | 12 ++++++++++--
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.pipelines/smp.yml b/.pipelines/smp.yml
index c60ae672..83644bbc 100644
--- a/.pipelines/smp.yml
+++ b/.pipelines/smp.yml
@@ -19,18 +19,18 @@ steps:
       filePath: '$(Build.SourcesDirectory)/scripts/sdl_check.sh'
 
   - task: Bash@3
-    displayName: 'Build SMP'
+    displayName: 'Build'
     inputs:
       filePath: '$(Build.SourcesDirectory)/scripts/build_smp.sh'
 
   - task: Bash@3
-    displayName: 'Test SMP'
+    displayName: 'Test'
     inputs:
       filePath: '$(Build.SourcesDirectory)/scripts/test_smp.sh'
 
   - task: PublishTestResults@2
     condition: succeededOrFailed()
-    displayName: 'Test SMP (PublishTestResults)'
+    displayName: 'PublishTestResults'
     inputs:
       testResultsFormat: 'cTest'
       testResultsFiles: '*/Testing/**/*.xml'
@@ -40,14 +40,20 @@ steps:
 
   - task: CopyFiles@2
     condition: succeededOrFailed()
-    displayName: 'Test SMP (PublishTestReports)'
+    displayName: 'CopyTestReports'
     inputs:
       SourceFolder: '$(Build.SourcesDirectory)/test/smp/cmake'
       Contents: |
         build/*.txt
         build/*/Testing/**/*.xml
         coverage_report/**/*
-      TargetFolder: '$(ob_outputDirectory)/test_reports_SMP'
+      TargetFolder: '$(build.artifactstagingdirectory)/test_reports_SMP'
+
+  - task: PublishBuildArtifacts@1
+    condition: succeededOrFailed()
+    displayName: 'PublishBuildArtifacts'
+    inputs:
+      pathToPublish: $(build.artifactstagingdirectory)
 
   - task: PublishCodeCoverageResults@1
     condition: succeededOrFailed()
@@ -56,4 +62,3 @@ steps:
       codeCoverageTool: 'Cobertura'
       summaryFileLocation: '$(Build.SourcesDirectory)/test/smp/cmake/coverage_report/default_build_coverage.xml'
       pathToSources: '$(Build.SourcesDirectory)/test/smp/cmake'
-      reportDirectory: '$(Build.SourcesDirectory)/test/smp/cmake/coverage_report/default_build_coverage'
diff --git a/.pipelines/tx.yml b/.pipelines/tx.yml
index b9319d2e..19e4a710 100644
--- a/.pipelines/tx.yml
+++ b/.pipelines/tx.yml
@@ -19,18 +19,18 @@ steps:
       filePath: '$(Build.SourcesDirectory)/scripts/sdl_check.sh'
 
   - task: Bash@3
-    displayName: 'Build TX'
+    displayName: 'Build'
     inputs:
       filePath: '$(Build.SourcesDirectory)/scripts/build_tx.sh'
 
   - task: Bash@3
-    displayName: 'Test TX'
+    displayName: 'Test'
     inputs:
       filePath: '$(Build.SourcesDirectory)/scripts/test_tx.sh'
 
   - task: PublishTestResults@2
     condition: succeededOrFailed()
-    displayName: 'Test TX (PublishTestResults)'
+    displayName: 'PublishTestResults'
     inputs:
       testResultsFormat: 'cTest'
       testResultsFiles: '*/Testing/**/*.xml'
@@ -40,14 +40,20 @@ steps:
 
   - task: CopyFiles@2
     condition: succeededOrFailed()
-    displayName: 'Test TX (PublishTestReports)'
+    displayName: 'CopyTestReports'
     inputs:
       SourceFolder: '$(Build.SourcesDirectory)/test/tx/cmake'
       Contents: |
         build/*.txt
         build/*/Testing/**/*.xml
         coverage_report/**/*
-      TargetFolder: '$(ob_outputDirectory)/test_reports_TX'
+      TargetFolder: '$(build.artifactstagingdirectory)/test_reports_TX'
+
+  - task: PublishBuildArtifacts@1
+    condition: succeededOrFailed()
+    displayName: 'PublishBuildArtifacts'
+    inputs:
+      pathToPublish: $(build.artifactstagingdirectory)
 
   - task: PublishCodeCoverageResults@1
     condition: succeededOrFailed()
@@ -56,4 +62,3 @@ steps:
       codeCoverageTool: 'Cobertura'
       summaryFileLocation: '$(Build.SourcesDirectory)/test/tx/cmake/coverage_report/default_build_coverage.xml'
       pathToSources: '$(Build.SourcesDirectory)/test/tx/cmake'
-      reportDirectory: '$(Build.SourcesDirectory)/test/tx/cmake/coverage_report/default_build_coverage'
diff --git a/test/tx/regression/threadx_event_flag_suspension_timeout_test.c b/test/tx/regression/threadx_event_flag_suspension_timeout_test.c
index 5bdc6c78..c689c755 100644
--- a/test/tx/regression/threadx_event_flag_suspension_timeout_test.c
+++ b/test/tx/regression/threadx_event_flag_suspension_timeout_test.c
@@ -179,8 +179,16 @@ UINT    status;
     tx_thread_sleep(63);
 
     /* Check the run counters.  */
-    if (((thread_1_counter != 32) && (thread_1_counter != 33)) || /* Depending on the starting time, thread 1 can run either 32 or 33 rounds. */
-        (thread_2_counter != 13))
+    if (((thread_1_counter != 32)
+#ifdef __linux__
+          && (thread_1_counter != 33) /* Depending on the starting time, thread 1 can run either 32 or 33 rounds. */
+#endif
+        ) ||
+        ((thread_2_counter != 13)
+#ifdef __linux__
+         && (thread_2_counter != 14) /* When CPU starves, the thread 2 can run 14 ronuds. */
+#endif
+        ))
     {
 
         /* Event flag error.  */