File tree Expand file tree Collapse file tree 2 files changed +21
-3
lines changed Expand file tree Collapse file tree 2 files changed +21
-3
lines changed Original file line number Diff line number Diff line change 4242 run : ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build memcheck
4343
4444 - 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
4646
4747 - name : Run tests with 'helgrind'
4848 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
1111TESTS=$4
1212
1313function 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]"
1617 echo " Where:"
1718 echo
1819 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
4344 exit 1
4445fi
4546
47+ EXCLUDE_LONGEST_TESTS=0
48+
4649case $TOOL in
4750memcheck)
4851 OPTION=" --leak-check=full"
4952 ;;
5053drd)
5154 OPTION=" --tool=drd"
5255 ;;
56+ drdshort)
57+ OPTION=" --tool=drd"
58+ TOOL=" drd"
59+ EXCLUDE_LONGEST_TESTS=1
60+ ;;
5361helgrind)
5462 OPTION=" --tool=helgrind"
5563 ;;
@@ -150,6 +158,16 @@ for test in $TESTS; do
150158 ;;
151159 esac
152160
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)
165+ echo " - SKIPPED (VERY LONG TEST)"
166+ continue ;
167+ ;;
168+ esac
169+ fi
170+
153171 [ " $FILTER " != " " ] && echo -n " ($FILTER ) "
154172
155173 LAST_TEST_FAILED=0
You can’t perform that action at this time.
0 commit comments