Commit 22ef7ba8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging 



docker patches

# gpg: Signature made Mon 12 Mar 2018 17:25:57 GMT
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  tests: make docker-test-debug@fedora run sanitizers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 834eddf2 02f769b7

tests/docker/dockerfiles/fedora.docker

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ FROM fedora:27 
ENV PACKAGES \

    ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \

    glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \

    gcc gcc-c++ clang make perl which bc findutils libaio-devel \

    gcc gcc-c++ llvm clang make perl which bc findutils libaio-devel \

    nettle-devel libasan libubsan \

    mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config \

    mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 \

tests/docker/test-debug

+3 −3
Original line number Diff line number Diff line 
#!/bin/bash -e

#

# Compile and check with clang & --enable-debug.

# Compile and check with clang & --enable-debug --enable-sanitizers.

#

# Copyright (c) 2016-2018 Red Hat Inc.

#
@@ -19,8 +19,8 @@ requires clang asan 
cd "$BUILD_DIR"



OPTS="--cxx=clang++ --cc=clang --host-cc=clang"

OPTS="--enable-debug $OPTS"

OPTS="--enable-debug --enable-sanitizers $OPTS"



build_qemu $OPTS

make $MAKEFLAGS check

make $MAKEFLAGS V=1 check

install_qemu