diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile.include | 46 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/centos6.docker | 31 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/centos7.docker | 31 |
4 files changed, 82 insertions, 28 deletions
diff --git a/Makefile b/Makefile index 97a58a0f4e..81447b1f08 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/tests/Makefile.include b/tests/Makefile.include index eb4895f94a..37c1bed683 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1,3 +1,26 @@ + +.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 diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker index 17a4d24d54..f6aae13f29 100644 --- a/tests/docker/dockerfiles/centos6.docker +++ b/tests/docker/dockerfiles/centos6.docker @@ -1,8 +1,29 @@ 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 diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker new file mode 100644 index 0000000000..0b59aa2f26 --- /dev/null +++ b/tests/docker/dockerfiles/centos7.docker @@ -0,0 +1,31 @@ +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 + |