run-coverity-scan: use --no-update-tools in docker run

Tools are already updated via the docker build.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-04-22 11:43:14 -04:00
parent b99b007905
commit 3077453cf9

View file

@ -325,17 +325,16 @@ if [ "$DOCKER" = yes ]; then
fi fi
echo "Archiving sources to be analyzed..." echo "Archiving sources to be analyzed..."
./scripts/archive-source.sh "$SECRETDIR/qemu-sources.tgz" ./scripts/archive-source.sh "$SECRETDIR/qemu-sources.tgz"
ARGS="--no-update-tools"
if [ "$DRYRUN" = yes ]; then if [ "$DRYRUN" = yes ]; then
DRYRUNARG=--dry-run ARGS="$ARGS --dry-run"
fi fi
echo "Running scanner..." echo "Running scanner..."
# If we need to capture the output tarball, get the inner run to # If we need to capture the output tarball, get the inner run to
# save it to the secrets directory so we can copy it out before the # save it to the secrets directory so we can copy it out before the
# directory is cleaned up. # directory is cleaned up.
if [ ! -z "$RESULTSTARBALL" ]; then if [ ! -z "$RESULTSTARBALL" ]; then
RTARGS="--results-tarball /work/cov-int.tar.xz" ARGS="$ARGS --results-tarball /work/cov-int.tar.xz"
else
RTARGS=""
fi fi
# Arrange for this docker run to get access to the sources with -v. # Arrange for this docker run to get access to the sources with -v.
# We pass through all the configuration from the outer script to the inner. # We pass through all the configuration from the outer script to the inner.
@ -343,8 +342,8 @@ if [ "$DOCKER" = yes ]; then
tests/docker/docker.py run -it --env COVERITY_EMAIL --env COVERITY_BUILD_CMD \ tests/docker/docker.py run -it --env COVERITY_EMAIL --env COVERITY_BUILD_CMD \
-v "$SECRETDIR:/work" coverity-scanner \ -v "$SECRETDIR:/work" coverity-scanner \
./run-coverity-scan --version "$VERSION" \ ./run-coverity-scan --version "$VERSION" \
--description "$DESCRIPTION" $DRYRUNARG --tokenfile /work/token \ --description "$DESCRIPTION" $ARGS --tokenfile /work/token \
--srcdir /qemu --src-tarball /work/qemu-sources.tgz $RTARGS --srcdir /qemu --src-tarball /work/qemu-sources.tgz
if [ ! -z "$RESULTSTARBALL" ]; then if [ ! -z "$RESULTSTARBALL" ]; then
echo "Copying results tarball to $RESULTSTARBALL..." echo "Copying results tarball to $RESULTSTARBALL..."
cp "$SECRETDIR/cov-int.tar.xz" "$RESULTSTARBALL" cp "$SECRETDIR/cov-int.tar.xz" "$RESULTSTARBALL"