Skip to content

Commit ac4833c

Browse files
[CI] Run all Valgrind tools in a single job
1 parent 27145b0 commit ac4833c

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/reusable_valgrind.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Run tests with valgrind intstrumentation tools: memcheck, drd, helgrind
12
name: Valgrind
23

34
on: workflow_call
@@ -8,10 +9,6 @@ permissions:
89
jobs:
910
valgrind:
1011
name: Valgrind
11-
strategy:
12-
fail-fast: false
13-
matrix:
14-
tool: ['memcheck', 'drd', 'helgrind']
1512
runs-on: ubuntu-latest
1613

1714
steps:
@@ -42,5 +39,11 @@ jobs:
4239
- name: Build
4340
run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc)
4441

45-
- name: Run tests under valgrind
46-
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}}
42+
- name: Run tests with 'memcheck'
43+
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build memcheck
44+
45+
- name: Run tests with 'drd'
46+
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build drd
47+
48+
- name: Run tests with 'helgrind'
49+
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build helgrind

test/test_valgrind.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ for test in $(ls -1 umf_test-*); do
145145
fi || true
146146
done
147147

148+
rm -rf ${BUILD_DIR}/test/cpuid
149+
148150
[ $ANY_TEST_FAILED -eq 0 ] && echo PASSED && exit 0
149151

150152
echo

0 commit comments

Comments
 (0)