* [Qemu-devel] [PULL 0/5] Build and test patches
@ 2017-08-15 10:57 Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 1/5] Makefile: Let "make check-help" work without running ./configure Fam Zheng
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
The following changes since commit 83c3a1f61673ef554facf4d6d29ed56c5a219f9d:
xlnx-qspi: add a property for mmio-execution (2017-08-14 14:17:18 +0100)
are available in the git repository at:
git://github.com/famz/qemu.git tags/build-and-test-pull-request
for you to fetch changes up to a8132a2f288c260fb43243eb3c092b5186d84968:
docker: add centos7 image (2017-08-15 15:16:45 +0800)
----------------------------------------------------------------
One fix and a few docker test enhancements. Not 2.10 blocker, but it's
good to have them.
----------------------------------------------------------------
Fam Zheng (1):
Makefile: Let "make check-help" work without running ./configure
Philippe Mathieu-Daudé (4):
docker: use one package per line in CentOS config
docker: add Xen libs to centos6 image
docker: install more packages on CentOS to extend code coverage
docker: add centos7 image
Makefile | 2 --
tests/Makefile.include | 46 ++++++++++++++++++---------------
tests/docker/dockerfiles/centos6.docker | 31 ++++++++++++++++++----
tests/docker/dockerfiles/centos7.docker | 31 ++++++++++++++++++++++
4 files changed, 82 insertions(+), 28 deletions(-)
create mode 100644 tests/docker/dockerfiles/centos7.docker
--
2.13.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 1/5] Makefile: Let "make check-help" work without running ./configure
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
@ 2017-08-15 10:57 ` Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 2/5] docker: use one package per line in CentOS config Fam Zheng
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
Currently if you do "make check-help" in a fresh checkout, only an error
is printed which is not nice:
$ make check-help V=1
cc -nostdlib -o check-help.mo
cc: fatal error: no input files
compilation terminated.
rules.mak:115: recipe for target 'check-help.mo' failed
make: *** [check-help.mo] Error 1
Move the config-host.mak condition into the body of
tests/Makefile.include and always include the rule for check-help.
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170810085025.14076-1-famz@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
Makefile | 2 --
tests/Makefile.include | 46 +++++++++++++++++++++++++---------------------
2 files changed, 25 insertions(+), 23 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
--
2.13.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 2/5] docker: use one package per line in CentOS config
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 1/5] Makefile: Let "make check-help" work without running ./configure Fam Zheng
@ 2017-08-15 10:57 ` Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 3/5] docker: add Xen libs to centos6 image Fam Zheng
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
This ease rebase/cherry-pick, also it is faster to visually find if a package
is here.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170728233316.13352-2-f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/dockerfiles/centos6.docker | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 17a4d24d54..9b91e832c2 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -1,8 +1,18 @@
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
+ENV PACKAGES \
+ bison \
+ ccache \
+ flex \
+ g++ \
+ gcc \
+ git \
+ glib2-devel \
+ libfdt-devel \
+ make \
+ pixman-devel \
+ SDL-devel \
+ tar \
+ zlib-devel
RUN yum install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.13.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 3/5] docker: add Xen libs to centos6 image
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 1/5] Makefile: Let "make check-help" work without running ./configure Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 2/5] docker: use one package per line in CentOS config Fam Zheng
@ 2017-08-15 10:57 ` Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 4/5] docker: install more packages on CentOS to extend code coverage Fam Zheng
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170728233316.13352-3-f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/dockerfiles/centos6.docker | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 9b91e832c2..8588a12eab 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -1,5 +1,5 @@
FROM centos:6
-RUN yum install -y epel-release
+RUN yum install -y epel-release centos-release-xen
ENV PACKAGES \
bison \
ccache \
@@ -13,6 +13,7 @@ ENV PACKAGES \
pixman-devel \
SDL-devel \
tar \
+ xen-devel \
zlib-devel
RUN yum install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.13.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 4/5] docker: install more packages on CentOS to extend code coverage
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
` (2 preceding siblings ...)
2017-08-15 10:57 ` [Qemu-devel] [PULL 3/5] docker: add Xen libs to centos6 image Fam Zheng
@ 2017-08-15 10:57 ` Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 5/5] docker: add centos7 image Fam Zheng
2017-08-15 12:13 ` [Qemu-devel] [PULL 0/5] Build and test patches Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170728233316.13352-4-f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/dockerfiles/centos6.docker | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tests/docker/dockerfiles/centos6.docker b/tests/docker/dockerfiles/centos6.docker
index 8588a12eab..f6aae13f29 100644
--- a/tests/docker/dockerfiles/centos6.docker
+++ b/tests/docker/dockerfiles/centos6.docker
@@ -2,17 +2,27 @@ FROM centos:6
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
--
2.13.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PULL 5/5] docker: add centos7 image
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
` (3 preceding siblings ...)
2017-08-15 10:57 ` [Qemu-devel] [PULL 4/5] docker: install more packages on CentOS to extend code coverage Fam Zheng
@ 2017-08-15 10:57 ` Fam Zheng
2017-08-15 12:13 ` [Qemu-devel] [PULL 0/5] Build and test patches Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Fam Zheng @ 2017-08-15 10:57 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20170728233316.13352-5-f4bug@amsat.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/docker/dockerfiles/centos7.docker | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 tests/docker/dockerfiles/centos7.docker
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
+
--
2.13.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PULL 0/5] Build and test patches
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
` (4 preceding siblings ...)
2017-08-15 10:57 ` [Qemu-devel] [PULL 5/5] docker: add centos7 image Fam Zheng
@ 2017-08-15 12:13 ` Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2017-08-15 12:13 UTC (permalink / raw)
To: Fam Zheng; +Cc: QEMU Developers
On 15 August 2017 at 11:57, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 83c3a1f61673ef554facf4d6d29ed56c5a219f9d:
>
> xlnx-qspi: add a property for mmio-execution (2017-08-14 14:17:18 +0100)
>
> are available in the git repository at:
>
> git://github.com/famz/qemu.git tags/build-and-test-pull-request
>
> for you to fetch changes up to a8132a2f288c260fb43243eb3c092b5186d84968:
>
> docker: add centos7 image (2017-08-15 15:16:45 +0800)
>
> ----------------------------------------------------------------
>
> One fix and a few docker test enhancements. Not 2.10 blocker, but it's
> good to have them.
>
> ----------------------------------------------------------------
>
> Fam Zheng (1):
> Makefile: Let "make check-help" work without running ./configure
>
> Philippe Mathieu-Daudé (4):
> docker: use one package per line in CentOS config
> docker: add Xen libs to centos6 image
> docker: install more packages on CentOS to extend code coverage
> docker: add centos7 image
>
> Makefile | 2 --
> tests/Makefile.include | 46 ++++++++++++++++++---------------
> tests/docker/dockerfiles/centos6.docker | 31 ++++++++++++++++++----
> tests/docker/dockerfiles/centos7.docker | 31 ++++++++++++++++++++++
> 4 files changed, 82 insertions(+), 28 deletions(-)
> create mode 100644 tests/docker/dockerfiles/centos7.docker
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-08-15 12:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-15 10:57 [Qemu-devel] [PULL 0/5] Build and test patches Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 1/5] Makefile: Let "make check-help" work without running ./configure Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 2/5] docker: use one package per line in CentOS config Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 3/5] docker: add Xen libs to centos6 image Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 4/5] docker: install more packages on CentOS to extend code coverage Fam Zheng
2017-08-15 10:57 ` [Qemu-devel] [PULL 5/5] docker: add centos7 image Fam Zheng
2017-08-15 12:13 ` [Qemu-devel] [PULL 0/5] Build and test patches Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.