File tree 4 files changed +23
-5
lines changed
4 files changed +23
-5
lines changed Original file line number Diff line number Diff line change @@ -129,7 +129,7 @@ jobs:
129
129
- name : Run DAX tests under valgrind
130
130
run : |
131
131
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} memcheck "${{env.DAX_TESTS}}"
132
- ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drd "${{env.DAX_TESTS}}"
132
+ ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drdshort "${{env.DAX_TESTS}}"
133
133
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} helgrind "${{env.DAX_TESTS}}"
134
134
135
135
- name : Check coverage
Original file line number Diff line number Diff line change 70
70
if : (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
71
71
run : |
72
72
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} memcheck "${{env.NUMA_TESTS}}"
73
- ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drd "${{env.NUMA_TESTS}}"
73
+ ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} drdshort "${{env.NUMA_TESTS}}"
74
74
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} helgrind "${{env.NUMA_TESTS}}"
75
75
76
76
- name : Check coverage
Original file line number Diff line number Diff line change 42
42
run : ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build memcheck
43
43
44
44
- name : Run tests with 'drd'
45
- run : ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build drd
45
+ run : ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build drdshort
46
46
47
47
- name : Run tests with 'helgrind'
48
48
run : ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build helgrind
Original file line number Diff line number Diff line change @@ -11,8 +11,9 @@ TOOL=$3
11
11
TESTS=$4
12
12
13
13
function print_usage() {
14
- echo " $( basename $0 ) - run UMF tests and examples under a valgrind tool (memcheck, drd or helgrind)"
15
- echo " Usage: $( basename $0 ) <workspace_dir> <build_dir> <memcheck|drd|helgrind> [tests_examples]"
14
+ echo " $( basename $0 ) - run UMF tests and examples under a valgrind tool (memcheck, drd, drdshort or helgrind)"
15
+ echo " drdshort - same as drd, but the longest lasting tests are excluded"
16
+ echo " Usage: $( basename $0 ) <workspace_dir> <build_dir> <memcheck|drd|drdshort|helgrind> [tests_examples]"
16
17
echo " Where:"
17
18
echo
18
19
echo " tests_examples - (optional) list of tests or examples to be run (paths relative to the <build_dir> build directory)."
@@ -43,13 +44,20 @@ if [ $(ls -1 ${BUILD_DIR}/test/test_* 2>/dev/null | wc -l) -eq 0 ]; then
43
44
exit 1
44
45
fi
45
46
47
+ EXCLUDE_LONGEST_TESTS=0
48
+
46
49
case $TOOL in
47
50
memcheck)
48
51
OPTION=" --leak-check=full"
49
52
;;
50
53
drd)
51
54
OPTION=" --tool=drd"
52
55
;;
56
+ drdshort)
57
+ OPTION=" --tool=drd"
58
+ TOOL=" drd"
59
+ EXCLUDE_LONGEST_TESTS=1
60
+ ;;
53
61
helgrind)
54
62
OPTION=" --tool=helgrind"
55
63
;;
@@ -150,6 +158,16 @@ for test in $TESTS; do
150
158
;;
151
159
esac
152
160
161
+ if [ $EXCLUDE_LONGEST_TESTS -eq 1 ]; then
162
+ # skip the longest tests
163
+ case $test in
164
+ ./test/test_jemalloc_pool|./test/test_jemalloc_coarse_file|./test/test_scalable_pool|./test/test_ipc_max_opened_limit|./test/test_ipc)
165
+ echo " - SKIPPED (VERY LONG TEST)"
166
+ continue ;
167
+ ;;
168
+ esac
169
+ fi
170
+
153
171
[ " $FILTER " != " " ] && echo -n " ($FILTER ) "
154
172
155
173
LAST_TEST_FAILED=0
You can’t perform that action at this time.
0 commit comments