Commit be9d1997 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



# gpg: Signature made Fri 29 Sep 2017 04:17:37 BST
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/docker-testing-pull-request:
  docker: Don't mount ccache db if NOUSER=1
  docker: test-block: Don't continue if build fails
  tests/docker/run: don't source /etc/profile
  docker: Fix test-mingw
  docker: add installation to build tests

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ab161529 36ac78e6

tests/docker/Makefile.include

+4 −2
Original line number Diff line number Diff line
@@ -143,9 +143,11 @@ docker-run: docker-qemu-src 
			-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \

			-e V=$V -e J=$J -e DEBUG=$(DEBUG)		\

			-e SHOW_ENV=$(SHOW_ENV) 			\

			$(if $(NOUSER),,				\

				-e CCACHE_DIR=/var/tmp/ccache 		\

			-v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \

				-v $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \

			)						\

			-v $$(readlink -e $(DOCKER_SRC_COPY)):/var/tmp/qemu:z$(COMMA)ro \

			$(IMAGE) 					\

			/var/tmp/qemu/run 				\

			$(TEST), "  RUN $(TEST) in ${IMAGE}")

tests/docker/common.rc

+8 −0
Original line number Diff line number Diff line
@@ -44,3 +44,11 @@ prep_fail() 
    echo "$@"

    exit 2

}



install_qemu()

{

    make install $MAKEFLAGS DESTDIR=$PWD/=destdir

    ret=$?

    rm -rf $PWD/=destdir

    return $ret

}

tests/docker/dockerfiles/centos6.docker

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ ENV PACKAGES \ 
    flex \

    g++ \

    gcc \

    gettext \

    git \

    glib2-devel \

    libepoxy-devel \

tests/docker/dockerfiles/centos7.docker

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ ENV PACKAGES \ 
    flex \

    g++ \

    gcc \

    gettext \

    git \

    glib2-devel \

    libepoxy-devel \

tests/docker/dockerfiles/debian-ports.docker

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ 
        clang \

        debian-ports-archive-keyring \

        flex \

        gettext \

        git \

        pkg-config \

        psmisc \