mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuzz: avoid building twice, when running on gitlab

Browse Source 
On oss-fuzz, we build twice, to put together a build that is portable to
the runner containers. On gitlab ci, this is wasteful and contributes to
timeouts on the build-oss-fuzz job. Avoid building twice on gitlab, at
the remote cost of potentially missing some cases that break oss-fuzz
builds.

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-Id: <20210809111621.54454-1-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alexander Bulekov 2021-08-09 07:16:21 -04:00 committed by Thomas Huth
parent b063c290f3
commit 3973e7ae63
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/oss-fuzz/build.sh
View File

@ -73,17 +73,19 @@ if ! make "-j$(nproc)" qemu-fuzz-i386; then
"\nFor example: CC=clang CXX=clang++ $0" "\nFor example: CC=clang CXX=clang++ $0"
fi fi
for i in $(ldd ./qemu-fuzz-i386 | cut -f3 -d' '); do if [ "$GITLAB_CI" != "true" ]; then
cp "$i" "$DEST_DIR/lib/" for i in $(ldd ./qemu-fuzz-i386 | cut -f3 -d' '); do
done cp "$i" "$DEST_DIR/lib/"
rm qemu-fuzz-i386 done
rm qemu-fuzz-i386
# Build a second time to build the final binary with correct rpath # Build a second time to build the final binary with correct rpath
../configure --disable-werror --cc="$CC" --cxx="$CXX" --enable-fuzzing \ ../configure --disable-werror --cc="$CC" --cxx="$CXX" --enable-fuzzing \
--prefix="$DEST_DIR" --bindir="$DEST_DIR" --datadir="$DEST_DIR/data/" \ --prefix="$DEST_DIR" --bindir="$DEST_DIR" --datadir="$DEST_DIR/data/" \
--extra-cflags="$EXTRA_CFLAGS" --extra-ldflags="-Wl,-rpath,\$ORIGIN/lib" \ --extra-cflags="$EXTRA_CFLAGS" --extra-ldflags="-Wl,-rpath,\$ORIGIN/lib" \
--target-list="i386-softmmu" --target-list="i386-softmmu"
make "-j$(nproc)" qemu-fuzz-i386 V=1 make "-j$(nproc)" qemu-fuzz-i386 V=1
fi
# Copy over the datadir # Copy over the datadir
cp -r ../pc-bios/ "$DEST_DIR/pc-bios" cp -r ../pc-bios/ "$DEST_DIR/pc-bios"