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

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



# gpg: Signature made Tue 15 Aug 2017 11:50:36 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/build-and-test-pull-request:
  docker: add centos7 image
  docker: install more packages on CentOS to extend code coverage
  docker: add Xen libs to centos6 image
  docker: use one package per line in CentOS config
  Makefile: Let "make check-help" work without running ./configure

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5681da29 a8132a2f

Makefile

+0 −2
Original line number Diff line number Diff line
@@ -281,9 +281,7 @@ dummy := $(call unnest-vars,, \ 
                common-obj-m \

                trace-obj-y)



ifneq ($(wildcard config-host.mak),)

include $(SRC_PATH)/tests/Makefile.include

endif



all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules

tests/Makefile.include

+25 −21
Original line number Diff line number Diff line 


.PHONY: check-help

check-help:

	@echo "Regression testing targets:"

	@echo

	@echo " make check                Run all tests"

	@echo " make check-qtest-TARGET   Run qtest tests for given target"

	@echo " make check-qtest          Run qtest tests"

	@echo " make check-unit           Run qobject tests"

	@echo " make check-speed          Run qobject speed tests"

	@echo " make check-qapi-schema    Run QAPI schema tests"

	@echo " make check-block          Run block tests"

	@echo " make check-report.html    Generates an HTML test report"

	@echo " make check-clean          Clean the tests"

	@echo

	@echo "Please note that HTML reports do not regenerate if the unit tests"

	@echo "has not changed."

	@echo

	@echo "The variable SPEED can be set to control the gtester speed setting."

	@echo "Default options are -k and (for make V=1) --verbose; they can be"

	@echo "changed with variable GTESTER_OPTIONS."



ifneq ($(wildcard config-host.mak),)

export SRC_PATH



qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
@@ -802,27 +825,6 @@ $(check-qtest-y): $(qtest-obj-y) 


tests/test-qga: tests/test-qga.o $(qtest-obj-y)



.PHONY: check-help

check-help:

	@echo "Regression testing targets:"

	@echo

	@echo " make check                Run all tests"

	@echo " make check-qtest-TARGET   Run qtest tests for given target"

	@echo " make check-qtest          Run qtest tests"

	@echo " make check-unit           Run qobject tests"

	@echo " make check-speed          Run qobject speed tests"

	@echo " make check-qapi-schema    Run QAPI schema tests"

	@echo " make check-block          Run block tests"

	@echo " make check-report.html    Generates an HTML test report"

	@echo " make check-clean          Clean the tests"

	@echo

	@echo "Please note that HTML reports do not regenerate if the unit tests"

	@echo "has not changed."

	@echo

	@echo "The variable SPEED can be set to control the gtester speed setting."

	@echo "Default options are -k and (for make V=1) --verbose; they can be"

	@echo "changed with variable GTESTER_OPTIONS."



SPEED = quick

GTESTER_OPTIONS = -k $(if $(V),--verbose,-q)

GCOV_OPTIONS = -n $(if $(V),-f,)
@@ -917,3 +919,5 @@ all: $(QEMU_IOTESTS_HELPERS-y) 


-include $(wildcard tests/*.d)

-include $(wildcard tests/libqos/*.d)



endif

tests/docker/dockerfiles/centos6.docker

+26 −5
Original line number Diff line number Diff line 
FROM centos:6

RUN yum install -y epel-release

ENV PACKAGES libfdt-devel ccache \

    tar git make gcc g++ flex bison \

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

    epel-release

RUN yum install -y epel-release centos-release-xen

ENV PACKAGES \

    bison \

    bzip2-devel \

    ccache \

    csnappy-devel \

    flex \

    g++ \

    gcc \

    git \

    glib2-devel \

    libepoxy-devel \

    libfdt-devel \

    librdmacm-devel \

    lzo-devel \

    make \

    mesa-libEGL-devel \

    mesa-libgbm-devel \

    pixman-devel \

    SDL-devel \

    spice-glib-devel \

    spice-server-devel \

    tar \

    vte-devel \

    xen-devel \

    zlib-devel

RUN yum install -y $PACKAGES

RUN rpm -q $PACKAGES | sort > /packages.txt

tests/docker/dockerfiles/centos7.docker

0 → 100644
+31 −0
Original line number Diff line number Diff line 
FROM centos:7

RUN yum install -y epel-release centos-release-xen

RUN yum -y update

ENV PACKAGES \

    bison \

    bzip2-devel \

    ccache \

    csnappy-devel \

    flex \

    g++ \

    gcc \

    git \

    glib2-devel \

    libepoxy-devel \

    libfdt-devel \

    librdmacm-devel \

    lzo-devel \

    make \

    mesa-libEGL-devel \

    mesa-libgbm-devel \

    pixman-devel \

    SDL-devel \

    spice-glib-devel \

    spice-server-devel \

    tar \

    vte-devel \

    xen-devel \

    zlib-devel

RUN yum install -y $PACKAGES

RUN rpm -q $PACKAGES | sort > /packages.txt