aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Schubert <bschubert@ddn.com>2024-03-20 00:56:18 +0100
committerBernd Schubert <bschubert@ddn.com>2024-03-20 12:37:15 +0100
commit99ef7a93eaf5440eddc03879b483726b329ccb4b (patch)
tree253d6cb619055ea6b2c5fe00397f9831af3c16d7
parent255de0b78a2a2c6202d87e40aab72c58b7fcf146 (diff)
downloadlibfuse-99ef7a93eaf5440eddc03879b483726b329ccb4b.tar.gz
ci-build.sh: Add back test without versioned symbols
Commit b1cdc497 ("ci-build.sh: Run ASAN and UBSAN at the same time") also accidentally removed the test for versioned symbols. Also export clang/clang++ to make sure new shells get it.
-rwxr-xr-xtest/ci-build.sh21
1 files changed, 15 insertions, 6 deletions
diff --git a/test/ci-build.sh b/test/ci-build.sh
index 4d269fa..0307865 100755
--- a/test/ci-build.sh
+++ b/test/ci-build.sh
@@ -88,7 +88,16 @@ sanitized_build()
# bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
meson configure -D b_lundef=false
+ # additional options
+ if [ -n "$@" ]; then
+ meson configure "$@"
+ fi
+
+ # print all options
meson configure --no-pager
+
+ # reconfigure to ensure it uses all additional options
+ meson setup --reconfigure "${SOURCE_DIR}"
ninja
sudo ninja install
sudo chmod 4755 ${PREFIX_DIR}/bin/fusermount3
@@ -110,15 +119,15 @@ sanitized_build()
)
# Sanitized build
-CC=clang
-CXX=clang++
+export CC=clang
+export CXX=clang++
TEST_WITH_VALGRIND=false
-sanitized_build $SAN
+sanitized_build
# Sanitized build without libc versioned symbols
-CC=clang
-CXX=clang++
-sanitized_build
+export CC=clang
+export CXX=clang++
+sanitized_build "-Ddisable-libc-symbol-version=true"
non_sanitized_build