Received: from eggs.gnu.org ([209.51.188.92]:39108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJFI3-0006B9-5D for qemu-devel@nongnu.org; Wed, 24 Apr 2019 06:38:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJFI1-0007dW-KD for qemu-devel@nongnu.org; Wed, 24 Apr 2019 06:38:11 -0400 From: Thomas Huth Date: Wed, 24 Apr 2019 12:37:46 +0200 Message-Id: <20190424103747.10173-6-thuth@redhat.com> In-Reply-To: <20190424103747.10173-1-thuth@redhat.com> References: <20190424103747.10173-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 5/6] tests: Run the iotests during "make check" again List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Fam Zheng , qemu-block@nongnu.org, Ed Maste , Kevin Wolf , Max Reitz , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= People often forget to run the iotests before submitting patches or pull requests - this is likely due to the fact that we do not run the tests during our mandatory "make check" tests yet. Now that we've got a new "ci" group of iotests that should be fine to run in every environ- ment, it should be OK to enable the iotests during "make check" again. Thus we now run the "ci" tests by default from the qemu-iotests-quick.sh script, and only use the former "quick" group (that contains some tests that are failing in some environments) when the user decided to run "make check SPEED=3Dthorough" or something similar. Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 +- tests/qemu-iotests-quick.sh | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 36fc73fef5..eb6a7a41e2 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-t= ests/qapi-schema/doc-good.texi check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS)) check-block: $(patsubst %,check-%, $(check-block-y)) -check: check-qapi-schema check-unit check-softfloat check-qtest check-de= codetree +check: check-qapi-schema check-unit check-softfloat check-qtest check-de= codetree check-block check-clean: rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(t= arget)-y)) $(check-qtest-generic-y)) diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh index 0e554bb972..416b3fc48b 100755 --- a/tests/qemu-iotests-quick.sh +++ b/tests/qemu-iotests-quick.sh @@ -1,8 +1,23 @@ #!/bin/sh =20 +# Honor the SPEED environment variable, just like we do it for the qtest= s. +# The default is to run all tests that still work fine in a CI environme= nts, +# but if the user set SPEED=3Dslow or SPEED=3Dthorough, we also run all = other +# tests that are still marked as "quick" +if [ "$SPEED" =3D "slow" -o "$SPEED" =3D "thorough" ]; then + group=3Dquick +else + group=3Dci +fi + +if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then + echo "No qemu-system binary available. Skipped qemu-iotests." + exit 0 +fi + cd tests/qemu-iotests =20 ret=3D0 -TEST_DIR=3D${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g = quick || ret=3D1 +TEST_DIR=3D${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g = "$group" || ret=3D1 =20 exit $ret --=20 2.21.0