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.

diff --git a/test/ci-build.sh b/test/ci-build.sh
index 4d269fa328b96b802087e1e07f7aab0d793bd364..0307865125bba21905cdb3677b74221ba68dd642 100755 (executable)
--- 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