ci: switch to --enable-fuzzers

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>

diff --git a/.github/workflows/sanitizers.sh b/.github/workflows/sanitizers.sh
index 311b596c0beda0f9fd58e97fda928e7d4b36e86b..4ed5da48c6fb44fa29280930a87e8d21df00ff18 100755 (executable)
--- a/.github/workflows/sanitizers.sh
+++ b/.github/workflows/sanitizers.sh
@@ -20,8 +20,13 @@ apt-get install --yes --no-install-recommends \
     python3-setuptools rsync squashfs-tools uidmap unzip uuid-runtime \
     wget xz-utils
 
+ARGS="--enable-sanitizers --enable-tests --prefix=/usr/ --sysconfdir=/etc/ --localstatedir=/var/ --disable-no-undefined"
+case "$CC" in clang*)
+       ARGS="$ARGS --enable-fuzzers"
+esac
+
 ./autogen.sh
-CFLAGS="-Wall -Werror" ./configure --enable-sanitizers --enable-tests --prefix=/usr/ --sysconfdir=/etc/ --localstatedir=/var/ --disable-no-undefined
+CFLAGS="-Wall -Werror" ./configure $ARGS
 make
 make install
 

diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
index 663de7101d746e0c6a30b209fb1845211e29c8d6..4c66a47c46246ae41d5fae909fa22e0f8678a805 100644 (file)
--- a/.github/workflows/sanitizers.yml
+++ b/.github/workflows/sanitizers.yml
@@ -17,4 +17,4 @@ jobs:
 
       - name: Build
         run: |
-          sudo CC=${{ matrix.compiler }} .github/workflows/sanitizers.sh
+          sudo CC=${{ matrix.compiler }} CXX=${{ matrix.compiler }}++ .github/workflows/sanitizers.sh

diff --git a/src/tests/oss-fuzz.sh b/src/tests/oss-fuzz.sh
index 266d25357d9f8ce7e4fe093ebc6030252361011f..27af5b1aeb0b84dc9965c756bcba89f934cf5188 100755 (executable)
--- a/src/tests/oss-fuzz.sh
+++ b/src/tests/oss-fuzz.sh
@@ -39,14 +39,15 @@ sed -i 's/^AC_CHECK_LIB(util/#/' configure.ac
     --disable-selinux \
     --disable-seccomp \
     --disable-capabilities \
-    --disable-no-undefined
+    --disable-no-undefined \
+    --enable-tests \
+    --enable-fuzzers
 
 make -j$(nproc)
 
 for fuzz_target_source in src/tests/fuzz-lxc*.c; do
     fuzz_target_name=$(basename "$fuzz_target_source" ".c")
-    $CC -c -o "$fuzz_target_name.o" $CFLAGS -Isrc -Isrc/lxc "$fuzz_target_source"
-    $CXX $CXXFLAGS $LIB_FUZZING_ENGINE "$fuzz_target_name.o" src/lxc/.libs/liblxc.a -o "$OUT/$fuzz_target_name"
+    cp "src/tests/$fuzz_target_name" "$OUT"
 done
 
 perl -lne 'if (/config_jump_table\[\]\s*=/../^}/) { /"([^"]+)"/ && print "$1=" }' src/lxc/confile.c >doc/examples/keys.conf