Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit dc1e4fc

Browse files
CI: disable libunwind for jobs with valgrind tests
1 parent 48be36f commit dc1e4fc

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/gha.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
"TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1",
3535
"TYPE=release OS=fedora OS_VER=32",
3636
"TYPE=release OS=ubuntu OS_VER=20.04",
37-
"TYPE=valgrind OS=ubuntu OS_VER=20.04",
38-
"TYPE=memcheck_drd OS=ubuntu OS_VER=20.04",
37+
"TYPE=valgrind OS=ubuntu OS_VER=20.04 TESTS_VALGRIND_UNWIND=0",
38+
"TYPE=memcheck_drd OS=ubuntu OS_VER=20.04 TESTS_VALGRIND_UNWIND=0",
3939
"TYPE=package OS=fedora OS_VER=32",
4040
"TYPE=package OS=ubuntu OS_VER=20.04"]
4141
steps:

.github/workflows/weekly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
"TYPE=debug OS=ubuntu OS_VER=20.04 TESTS_UBSAN=1 TESTS_PMREORDER=0",
2929
"TYPE=debug OS=fedora OS_VER=rawhide TESTS_ASAN=1 TESTS_PMREORDER=0",
3030
"TYPE=debug OS=fedora OS_VER=rawhide TESTS_UBSAN=1 TESTS_PMREORDER=0",
31-
"TYPE=valgrind OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
32-
"TYPE=memcheck_drd OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
31+
"TYPE=valgrind OS=fedora OS_VER=rawhide TESTS_PMREORDER=0 TESTS_VALGRIND_UNWIND=0",
32+
"TYPE=memcheck_drd OS=fedora OS_VER=rawhide TESTS_PMREORDER=0 TESTS_VALGRIND_UNWIND=0",
3333
"TYPE=package OS=fedora OS_VER=34",
3434
"TYPE=package OS=fedora OS_VER=rawhide TESTS_PMREORDER=0",
3535
"TYPE=package OS=ubuntu OS_VER=devel"]

utils/docker/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ docker run --privileged=true --name=${CONTAINER_NAME} -i \
139139
--env TESTS_PACKAGES=${TESTS_PACKAGES:-ON} \
140140
--env TESTS_ASAN=${TESTS_ASAN:-OFF} \
141141
--env TESTS_UBSAN=${TESTS_UBSAN:-OFF} \
142+
--env TESTS_VALGRIND_UNWIND=${TESTS_VALGRIND_UNWIND:-OFF} \
142143
--env TEST_TIMEOUT=${TEST_TIMEOUT} \
143144
--env TZ='Europe/Warsaw' \
144145
--shm-size=4G \

utils/docker/run-build.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ TESTS_PACKAGES=${TESTS_PACKAGES:-ON}
2323
TESTS_USE_FORCED_PMEM=${TESTS_USE_FORCED_PMEM:-ON}
2424
TESTS_ASAN=${TESTS_ASAN:-OFF}
2525
TESTS_UBSAN=${TESTS_UBSAN:-OFF}
26+
TESTS_VALGRIND_UNWIND=${TESTS_VALGRIND_UNWIND:-OFF}
2627
TEST_TIMEOUT=${TEST_TIMEOUT:-600}
2728

2829
export PMREORDER_STACKTRACE_DEPTH=20
@@ -106,6 +107,7 @@ function tests_clang_release_cpp11_no_valgrind() {
106107
# BUILD build_gcc_debug_cpp14 (no tests)
107108
###############################################################################
108109
function build_gcc_debug_cpp14() {
110+
VALGRIND_UNWIND=${1:-ON}
109111
mkdir build
110112
cd build
111113

@@ -128,7 +130,8 @@ function build_gcc_debug_cpp14() {
128130
-DTESTS_COMPATIBILITY=1 \
129131
-DTESTS_CONCURRENT_GDB=1 \
130132
-DUSE_ASAN=${TESTS_ASAN} \
131-
-DUSE_UBSAN=${TESTS_UBSAN}
133+
-DUSE_UBSAN=${TESTS_UBSAN} \
134+
-DUSE_LIBUNWIND=${VALGRIND_UNWIND}
132135

133136
make -j$(nproc)
134137
}
@@ -152,7 +155,7 @@ function tests_gcc_debug_cpp14_no_valgrind() {
152155
###############################################################################
153156
function tests_gcc_debug_cpp14_valgrind_memcheck_drd() {
154157
printf "\n$(tput setaf 1)$(tput setab 7)BUILD ${FUNCNAME[0]} START$(tput sgr 0)\n"
155-
build_gcc_debug_cpp14
158+
build_gcc_debug_cpp14 ${TESTS_VALGRIND_UNWIND}
156159
ctest -R "_memcheck|_drd" --timeout ${TEST_TIMEOUT} --output-on-failure
157160
workspace_cleanup
158161
printf "$(tput setaf 1)$(tput setab 7)BUILD ${FUNCNAME[0]} END$(tput sgr 0)\n\n"
@@ -163,7 +166,7 @@ function tests_gcc_debug_cpp14_valgrind_memcheck_drd() {
163166
###############################################################################
164167
function tests_gcc_debug_cpp14_valgrind_other() {
165168
printf "\n$(tput setaf 1)$(tput setab 7)BUILD ${FUNCNAME[0]} START$(tput sgr 0)\n"
166-
build_gcc_debug_cpp14
169+
build_gcc_debug_cpp14 ${TESTS_VALGRIND_UNWIND}
167170
ctest -E "_none|_memcheck|_drd" --timeout ${TEST_TIMEOUT} --output-on-failure
168171
ctest -R "_pmreorder" --timeout ${TEST_TIMEOUT} --output-on-failure
169172
workspace_cleanup
@@ -210,7 +213,6 @@ function tests_gcc_release_cpp17_no_valgrind() {
210213
###############################################################################
211214
# BUILD tests_clang_release_cpp20_no_valgrind llvm
212215
###############################################################################
213-
214216
function tests_clang_release_cpp20_no_valgrind() {
215217
printf "\n$(tput setaf 1)$(tput setab 7)BUILD ${FUNCNAME[0]} START$(tput sgr 0)\n"
216218

0 commit comments

Comments
 (0)