Skip to content

Commit 7d60f11

Browse files
committed
Move the longest drd tests to Nightly build
Move the longest drd tests to Nightly build. Add the drdshort option to the valgrind script. Signed-off-by: Lukasz Dorau <[email protected]>
1 parent e66a3cb commit 7d60f11

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

.github/workflows/reusable_dax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
- name: Run DAX tests under valgrind
130130
run: |
131131
${{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}}"
133133
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} helgrind "${{env.DAX_TESTS}}"
134134
135135
- name: Check coverage

.github/workflows/reusable_multi_numa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
if: (matrix.os != 'rhel-9.1') && (matrix.os != 'sles-15')
7171
run: |
7272
${{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}}"
7474
${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{env.BUILD_DIR}} helgrind "${{env.NUMA_TESTS}}"
7575
7676
- name: Check coverage

.github/workflows/reusable_valgrind.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
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

test/test_valgrind.sh

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ TOOL=$3
1111
TESTS=$4
1212

1313
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]"
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
4445
fi
4546

47+
EXCLUDE_LONGEST_TESTS=0
48+
4649
case $TOOL in
4750
memcheck)
4851
OPTION="--leak-check=full"
4952
;;
5053
drd)
5154
OPTION="--tool=drd"
5255
;;
56+
drdshort)
57+
OPTION="--tool=drd"
58+
TOOL="drd"
59+
EXCLUDE_LONGEST_TESTS=1
60+
;;
5361
helgrind)
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|./test/test_ipc)
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

0 commit comments

Comments
 (0)