Split task 'Run test without Code Coverage' (microsoft#2635)

* Run non-code-coverage test with timeout. Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> * Execute setup_build during FuzzerDebug build Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> * Fix issue with ebpf_performance.exe Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> --------- Signed-off-by: Alan Jowett <alan.jowett@microsoft.com> Co-authored-by: Alan Jowett <alan.jowett@microsoft.com>
WilliamTaack · Jun 28, 2023 · 44adc8e · 44adc8e
1 parent 8fecc2e
commit 44adc8e
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 5 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -324,7 +324,7 @@ jobs:
     with:
       name: stress
       # Until there is a dedicated stress test, re-use the perf test.
-      test_command: .\ebpf_performance.exe
+      test_command: .\ebpf_performance.exe -d yes
       build_artifact: Build-x64
       environment: windows-2022
       # No code coverage on stress.

diff --git a/.github/workflows/reusable-test.yml b/.github/workflows/reusable-test.yml
@@ -211,12 +211,21 @@ jobs:
           set EBPF_ENABLE_WER_REPORT=yes
           OpenCppCoverage.exe -q --sources %CD% --excluded_sources %CD%\external\Catch2 --export_type cobertura:ebpf_for_windows.xml --working_dir ${{env.BUILD_PLATFORM}}\${{env.BUILD_CONFIGURATION}} -- powershell .\Run-Test.ps1 ${{env.DUMP_PATH}} ${{env.TEST_TIMEOUT}} ${{env.TEST_COMMAND}}
 
+    - name: Run test on self-hosted runner
+      if: (inputs.code_coverage == false) && (steps.skip_check.outputs.should_skip != 'true') && (inputs.environment == 'ebpf_cicd_tests')
+      id: run_test_self_hosted
+      working-directory: ./${{env.BUILD_PLATFORM}}/${{env.BUILD_CONFIGURATION}}
+      run: |
+        ${{env.TEST_COMMAND}}
+
     - name: Run test without Code Coverage
-      if: (inputs.code_coverage == false) && (steps.skip_check.outputs.should_skip != 'true')
+      if: (inputs.code_coverage == false) && (steps.skip_check.outputs.should_skip != 'true') && (inputs.environment != 'ebpf_cicd_tests')
       id: run_test_without_code_coverage
       working-directory: ./${{env.BUILD_PLATFORM}}/${{env.BUILD_CONFIGURATION}}
+      shell: cmd
       run: |
-        ${{env.TEST_COMMAND}}
+        cd /d ${{github.workspace}}\${{env.BUILD_PLATFORM}}\${{env.BUILD_CONFIGURATION}}
+        powershell.exe .\Run-Test.ps1 ${{env.DUMP_PATH}} ${{env.TEST_TIMEOUT}} ${{env.TEST_COMMAND}}
 
     - name: Run post test command
       # Run the post test command even if the workflow has failed.

diff --git a/ebpf-for-windows.sln b/ebpf-for-windows.sln
@@ -683,8 +683,8 @@ Global
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.Debug|x86.Build.0 = Debug|Win32
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|ARM64.ActiveCfg = Debug|x64
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|ARM64.Build.0 = Debug|x64
-		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x64.ActiveCfg = Debug|x64
-		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x64.Build.0 = Debug|x64
+		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x64.ActiveCfg = FuzzerDebug|x64
+		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x64.Build.0 = FuzzerDebug|x64
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x86.ActiveCfg = Debug|Win32
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.FuzzerDebug|x86.Build.0 = Debug|Win32
 		{231EE32B-EBA4-4FE5-A55B-DB18F539D403}.MinSizeRel|ARM64.ActiveCfg = Debug|Win32