diff --git a/.github/workflows/pmem_test_matrix.yml b/.github/workflows/pmem_test_matrix.yml index fc47d592de0..4b62b0c6788 100644 --- a/.github/workflows/pmem_test_matrix.yml +++ b/.github/workflows/pmem_test_matrix.yml @@ -38,7 +38,7 @@ jobs: - name: Test prepare uses: ./.github/actions/pmem_test_prepare with: - valgrind: ${{ fromJSON(inputs.valgrind) }} + valgrind: ${{ inputs.valgrind }} - name: Test run uses: ./.github/actions/pmem_test_run @@ -46,4 +46,3 @@ jobs: test_script: ${{ matrix.test_script }} build: ${{ matrix.build }} force_enable: ${{ matrix.force_enable }} - valgrind: ${{ fromJSON(inputs.valgrind) }} diff --git a/.github/workflows/pmem_tests.yml b/.github/workflows/pmem_tests.yml index 0efa1a5469b..7b4ce111f33 100644 --- a/.github/workflows/pmem_tests.yml +++ b/.github/workflows/pmem_tests.yml @@ -28,6 +28,7 @@ jobs: force_enable: '["pmemcheck", "memcheck"]' valgrind: 1 + # Test the default build with force-enabled Valgrind tooling for thread error # detection. Thread: @@ -38,6 +39,7 @@ jobs: # 9h = 7h20m (the longest workflow execution time) + ~20% leeway. timeout_minutes: 540 + # Static builds are tested in this limited scope only. static: name: Static @@ -108,3 +110,11 @@ jobs: uses: ./.github/actions/pmem_test_run with: build: nondebug # only the production build is considered + + # Test the default build with the basic test suite. + Basic_w_Valgrind: + uses: ./.github/workflows/pmem_test_matrix.yml + with: + # Exclude all Valgrind tests but keep Valgrind tools built-in. + force_enable: '["none"]' + valgrind: 1