From nobody Thu Nov 6 08:23:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539771109254662.9032593472343; Wed, 17 Oct 2018 03:11:49 -0700 (PDT) Received: from localhost ([::1]:35102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCins-0002BS-1u for importer@patchew.org; Wed, 17 Oct 2018 06:11:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCihq-0005kf-41 for qemu-devel@nongnu.org; Wed, 17 Oct 2018 06:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCihb-00012S-63 for qemu-devel@nongnu.org; Wed, 17 Oct 2018 06:05:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gCihX-0000xP-RH for qemu-devel@nongnu.org; Wed, 17 Oct 2018 06:05:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 367FE5A1FD; Wed, 17 Oct 2018 10:05:15 +0000 (UTC) Received: from thuth.com (ovpn-116-148.ams2.redhat.com [10.36.116.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DAF42C7A7; Wed, 17 Oct 2018 10:05:14 +0000 (UTC) From: Thomas Huth To: Peter Maydell Date: Wed, 17 Oct 2018 12:04:55 +0200 Message-Id: <1539770707-7289-4-git-send-email-thuth@redhat.com> In-Reply-To: <1539770707-7289-1-git-send-email-thuth@redhat.com> References: <1539770707-7289-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 17 Oct 2018 10:05:15 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 03/15] tests: Prevent more accidental test disabling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Eric Blake GNU make is perfectly happy to use 'check-FOO-y +=3D bar' to initialize check-FOO-y. (GNU Automake strictly insists that you cannot use +=3D until after an initial =3D per variable, but thankfully we aren't using automake). As we have had more than one instance where copy-and-paste of 'check-FOO-y =3D bar' from a first test under category FOO into an additional test, which ends up disabling the first (see commits 992159c7 and 4429532b), it's better to just always use the form that survives copy-and-paste, even for categories that don't currently add more than one test. Done with s/^\(check-[a-z]*-y \)=3D/\1+=3D/g Signed-off-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- tests/Makefile.include | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 5eadfd5..b68cbb3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,7 +38,7 @@ $(SRC_PATH)/scripts/qapi-gen.py SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-unit-y =3D tests/check-qdict$(EXESUF) +check-unit-y +=3D tests/check-qdict$(EXESUF) gcov-files-check-qdict-y =3D qobject/qdict.c check-unit-y +=3D tests/check-block-qdict$(EXESUF) gcov-files-check-block-qdict-y =3D qobject/block-qdict.c @@ -181,7 +181,7 @@ check-block-$(CONFIG_POSIX) +=3D tests/qemu-iotests-qui= ck.sh # All QTests for now are POSIX-only, but the dependencies are # really in libqtest, not in the testcases themselves. =20 -check-qtest-generic-y =3D tests/qmp-test$(EXESUF) +check-qtest-generic-y +=3D tests/qmp-test$(EXESUF) gcov-files-generic-y =3D monitor.c qapi/qmp-dispatch.c check-qtest-generic-y +=3D tests/qmp-cmd-test$(EXESUF) =20 @@ -324,13 +324,13 @@ check-qtest-x86_64-$(CONFIG_SDHCI) +=3D tests/sdhci-t= est$(EXESUF) gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files= -i386-y)) =20 -check-qtest-alpha-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-alpha-y +=3D tests/boot-serial-test$(EXESUF) =20 -check-qtest-hppa-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-hppa-y +=3D tests/boot-serial-test$(EXESUF) =20 check-qtest-m68k-y =3D tests/boot-serial-test$(EXESUF) =20 -check-qtest-microblaze-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-microblaze-y +=3D tests/boot-serial-test$(EXESUF) =20 check-qtest-mips-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) =20 @@ -338,7 +338,7 @@ check-qtest-mips64-$(CONFIG_ISA_TESTDEV) =3D tests/endi= anness-test$(EXESUF) =20 check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXES= UF) =20 -check-qtest-moxie-y =3D tests/boot-serial-test$(EXESUF) +check-qtest-moxie-y +=3D tests/boot-serial-test$(EXESUF) =20 check-qtest-ppc-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) @@ -348,7 +348,7 @@ check-qtest-ppc-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-ppc-y +=3D tests/m48t59-test$(EXESUF) gcov-files-ppc-y +=3D hw/timer/m48t59.c =20 -check-qtest-ppc64-y =3D $(check-qtest-ppc-y) +check-qtest-ppc64-y +=3D $(check-qtest-ppc-y) gcov-files-ppc64-y =3D $(subst ppc-softmmu/,ppc64-softmmu/,$(gcov-files-pp= c-y)) check-qtest-ppc64-y +=3D tests/spapr-phb-test$(EXESUF) gcov-files-ppc64-y +=3D ppc64-softmmu/hw/ppc/spapr_pci.c @@ -377,7 +377,7 @@ check-qtest-sh4-$(CONFIG_ISA_TESTDEV) =3D tests/endiann= ess-test$(EXESUF) =20 check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) =3D tests/endianness-test$(EXESUF) =20 -check-qtest-sparc-y =3D tests/prom-env-test$(EXESUF) +check-qtest-sparc-y +=3D tests/prom-env-test$(EXESUF) check-qtest-sparc-y +=3D tests/m48t59-test$(EXESUF) gcov-files-sparc-y =3D hw/timer/m48t59.c check-qtest-sparc-y +=3D tests/boot-serial-test$(EXESUF) @@ -386,7 +386,7 @@ check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) =3D tests/end= ianness-test$(EXESUF) check-qtest-sparc64-y +=3D tests/prom-env-test$(EXESUF) check-qtest-sparc64-y +=3D tests/boot-serial-test$(EXESUF) =20 -check-qtest-arm-y =3D tests/tmp105-test$(EXESUF) +check-qtest-arm-y +=3D tests/tmp105-test$(EXESUF) check-qtest-arm-y +=3D tests/pca9552-test$(EXESUF) check-qtest-arm-y +=3D tests/ds1338-test$(EXESUF) check-qtest-arm-y +=3D tests/m25p80-test$(EXESUF) @@ -404,9 +404,9 @@ check-qtest-aarch64-$(CONFIG_SDHCI) +=3D tests/sdhci-te= st$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-aarch64-y +=3D tests/migration-test$(EXESUF) =20 -check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) +check-qtest-microblazeel-y +=3D $(check-qtest-microblaze-y) =20 -check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) +check-qtest-xtensaeb-y +=3D $(check-qtest-xtensa-y) =20 check-qtest-s390x-y =3D tests/boot-serial-test$(EXESUF) check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) --=20 1.8.3.1