From nobody Sun May 5 11:05:44 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541159671922579.6648276704353; Fri, 2 Nov 2018 04:54:31 -0700 (PDT) Received: from localhost ([::1]:50938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY1n-0000Rs-EU for importer@patchew.org; Fri, 02 Nov 2018 07:54:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY0O-0007Nl-Tm for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIY0M-0004H5-UV for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:48 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIY0M-0004G9-IO for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:46 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gIY0K-0003LQ-FC; Fri, 02 Nov 2018 11:52:44 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 11:52:36 +0000 Message-Id: <20181102115239.22485-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102115239.22485-1-peter.maydell@linaro.org> References: <20181102115239.22485-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2 for-3.1 1/4] tests: Move tests/acpi-test-data/ to tests/data/acpi/ 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: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently tests/acpi-test-data contains data files used by the bios-tables-test, and configure individually symlinks those data files into the build directory using a wildcard. Using a wildcard like this is a bad idea, because if a new data file is added, nothing causes configure to be rerun, and so no symlink is added for the new file. This can cause tests to spuriously fail when they can't find their data. Instead, it's better to symlink an entire directory of data files. We already have such a directory: tests/data. Move the data files from tests/acpi-test-data/ to tests/data/acpi/, and remove the unnecessary symlinking. We can remove entirely the note in rebuild-expected-aml.sh about copying any new data files, because now they will be in the source directory, not the build directory, and no copying is required. (We can't just change the existing tests/acpi-test-data/ to being a symlinked directory, because if we did that and a developer switched git branches from one after that change to one before it then configure would end up trashing all the test files by making them symlinks to themselves. Changing their path avoids this annoyance.) Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- configure | 4 ---- tests/bios-tables-test.c | 2 +- tests/{acpi-test-data =3D> data/acpi}/pc/APIC | Bin tests/{acpi-test-data =3D> data/acpi}/pc/APIC.cphp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/APIC.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.bridge | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.cphp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.ipmikcs | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.memhp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.numamem | Bin tests/{acpi-test-data =3D> data/acpi}/pc/FACP | Bin tests/{acpi-test-data =3D> data/acpi}/pc/FACS | Bin tests/{acpi-test-data =3D> data/acpi}/pc/HPET | Bin tests/{acpi-test-data =3D> data/acpi}/pc/NFIT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SLIT.cphp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SLIT.memhp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.cphp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.memhp | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.numamem | Bin tests/{acpi-test-data =3D> data/acpi}/pc/SSDT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/q35/APIC | Bin tests/{acpi-test-data =3D> data/acpi}/q35/APIC.cphp | Bin .../{acpi-test-data =3D> data/acpi}/q35/APIC.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/q35/DSDT | Bin tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.bridge | Bin tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.cphp | Bin .../{acpi-test-data =3D> data/acpi}/q35/DSDT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.ipmibt | Bin tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.memhp | Bin .../{acpi-test-data =3D> data/acpi}/q35/DSDT.numamem | Bin tests/{acpi-test-data =3D> data/acpi}/q35/FACP | Bin tests/{acpi-test-data =3D> data/acpi}/q35/FACS | Bin tests/{acpi-test-data =3D> data/acpi}/q35/HPET | Bin tests/{acpi-test-data =3D> data/acpi}/q35/MCFG | Bin .../{acpi-test-data =3D> data/acpi}/q35/NFIT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/q35/SLIT.cphp | Bin tests/{acpi-test-data =3D> data/acpi}/q35/SLIT.memhp | Bin tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.cphp | Bin .../{acpi-test-data =3D> data/acpi}/q35/SRAT.dimmpxm | Bin tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.memhp | Bin .../{acpi-test-data =3D> data/acpi}/q35/SRAT.numamem | Bin .../{acpi-test-data =3D> data/acpi}/q35/SSDT.dimmpxm | Bin .../acpi}/rebuild-expected-aml.sh | 2 -- 46 files changed, 1 insertion(+), 7 deletions(-) rename tests/{acpi-test-data =3D> data/acpi}/pc/APIC (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/APIC.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/APIC.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.bridge (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.ipmikcs (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/DSDT.numamem (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/FACP (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/FACS (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/HPET (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/NFIT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SLIT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SLIT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SRAT.numamem (100%) rename tests/{acpi-test-data =3D> data/acpi}/pc/SSDT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/APIC (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/APIC.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/APIC.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.bridge (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.ipmibt (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/DSDT.numamem (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/FACP (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/FACS (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/HPET (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/MCFG (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/NFIT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SLIT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SLIT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.cphp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.memhp (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SRAT.numamem (100%) rename tests/{acpi-test-data =3D> data/acpi}/q35/SSDT.dimmpxm (100%) rename tests/{acpi-test-data =3D> data/acpi}/rebuild-expected-aml.sh (86%) diff --git a/configure b/configure index 46ae1e8c767..895b7483b8a 100755 --- a/configure +++ b/configure @@ -7421,10 +7421,6 @@ for bios_file in \ do FILES=3D"$FILES pc-bios/$(basename $bios_file)" done -for test_file in $(find $source_path/tests/acpi-test-data -type f) -do - FILES=3D"$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*ac= pi-test-data//')" -done for test_file in $(find $source_path/tests/hex-loader-check-data -type f) do FILES=3D"$FILES tests/hex-loader-check-data$(echo $test_file | sed -e = 's/.*hex-loader-check-data//')" diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 02e77ec811b..b14c8eaa171 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -42,7 +42,7 @@ typedef struct { } test_data; =20 static char disk[] =3D "tests/acpi-test-disk-XXXXXX"; -static const char *data_dir =3D "tests/acpi-test-data"; +static const char *data_dir =3D "tests/data/acpi"; #ifdef CONFIG_IASL static const char *iasl =3D stringify(CONFIG_IASL); #else diff --git a/tests/acpi-test-data/pc/APIC b/tests/data/acpi/pc/APIC similarity index 100% rename from tests/acpi-test-data/pc/APIC rename to tests/data/acpi/pc/APIC diff --git a/tests/acpi-test-data/pc/APIC.cphp b/tests/data/acpi/pc/APIC.cp= hp similarity index 100% rename from tests/acpi-test-data/pc/APIC.cphp rename to tests/data/acpi/pc/APIC.cphp diff --git a/tests/acpi-test-data/pc/APIC.dimmpxm b/tests/data/acpi/pc/APIC= .dimmpxm similarity index 100% rename from tests/acpi-test-data/pc/APIC.dimmpxm rename to tests/data/acpi/pc/APIC.dimmpxm diff --git a/tests/acpi-test-data/pc/DSDT b/tests/data/acpi/pc/DSDT similarity index 100% rename from tests/acpi-test-data/pc/DSDT rename to tests/data/acpi/pc/DSDT diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.= bridge similarity index 100% rename from tests/acpi-test-data/pc/DSDT.bridge rename to tests/data/acpi/pc/DSDT.bridge diff --git a/tests/acpi-test-data/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cp= hp similarity index 100% rename from tests/acpi-test-data/pc/DSDT.cphp rename to tests/data/acpi/pc/DSDT.cphp diff --git a/tests/acpi-test-data/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT= .dimmpxm similarity index 100% rename from tests/acpi-test-data/pc/DSDT.dimmpxm rename to tests/data/acpi/pc/DSDT.dimmpxm diff --git a/tests/acpi-test-data/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT= .ipmikcs similarity index 100% rename from tests/acpi-test-data/pc/DSDT.ipmikcs rename to tests/data/acpi/pc/DSDT.ipmikcs diff --git a/tests/acpi-test-data/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.m= emhp similarity index 100% rename from tests/acpi-test-data/pc/DSDT.memhp rename to tests/data/acpi/pc/DSDT.memhp diff --git a/tests/acpi-test-data/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT= .numamem similarity index 100% rename from tests/acpi-test-data/pc/DSDT.numamem rename to tests/data/acpi/pc/DSDT.numamem diff --git a/tests/acpi-test-data/pc/FACP b/tests/data/acpi/pc/FACP similarity index 100% rename from tests/acpi-test-data/pc/FACP rename to tests/data/acpi/pc/FACP diff --git a/tests/acpi-test-data/pc/FACS b/tests/data/acpi/pc/FACS similarity index 100% rename from tests/acpi-test-data/pc/FACS rename to tests/data/acpi/pc/FACS diff --git a/tests/acpi-test-data/pc/HPET b/tests/data/acpi/pc/HPET similarity index 100% rename from tests/acpi-test-data/pc/HPET rename to tests/data/acpi/pc/HPET diff --git a/tests/acpi-test-data/pc/NFIT.dimmpxm b/tests/data/acpi/pc/NFIT= .dimmpxm similarity index 100% rename from tests/acpi-test-data/pc/NFIT.dimmpxm rename to tests/data/acpi/pc/NFIT.dimmpxm diff --git a/tests/acpi-test-data/pc/SLIT.cphp b/tests/data/acpi/pc/SLIT.cp= hp similarity index 100% rename from tests/acpi-test-data/pc/SLIT.cphp rename to tests/data/acpi/pc/SLIT.cphp diff --git a/tests/acpi-test-data/pc/SLIT.memhp b/tests/data/acpi/pc/SLIT.m= emhp similarity index 100% rename from tests/acpi-test-data/pc/SLIT.memhp rename to tests/data/acpi/pc/SLIT.memhp diff --git a/tests/acpi-test-data/pc/SRAT.cphp b/tests/data/acpi/pc/SRAT.cp= hp similarity index 100% rename from tests/acpi-test-data/pc/SRAT.cphp rename to tests/data/acpi/pc/SRAT.cphp diff --git a/tests/acpi-test-data/pc/SRAT.dimmpxm b/tests/data/acpi/pc/SRAT= .dimmpxm similarity index 100% rename from tests/acpi-test-data/pc/SRAT.dimmpxm rename to tests/data/acpi/pc/SRAT.dimmpxm diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/data/acpi/pc/SRAT.m= emhp similarity index 100% rename from tests/acpi-test-data/pc/SRAT.memhp rename to tests/data/acpi/pc/SRAT.memhp diff --git a/tests/acpi-test-data/pc/SRAT.numamem b/tests/data/acpi/pc/SRAT= .numamem similarity index 100% rename from tests/acpi-test-data/pc/SRAT.numamem rename to tests/data/acpi/pc/SRAT.numamem diff --git a/tests/acpi-test-data/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT= .dimmpxm similarity index 100% rename from tests/acpi-test-data/pc/SSDT.dimmpxm rename to tests/data/acpi/pc/SSDT.dimmpxm diff --git a/tests/acpi-test-data/q35/APIC b/tests/data/acpi/q35/APIC similarity index 100% rename from tests/acpi-test-data/q35/APIC rename to tests/data/acpi/q35/APIC diff --git a/tests/acpi-test-data/q35/APIC.cphp b/tests/data/acpi/q35/APIC.= cphp similarity index 100% rename from tests/acpi-test-data/q35/APIC.cphp rename to tests/data/acpi/q35/APIC.cphp diff --git a/tests/acpi-test-data/q35/APIC.dimmpxm b/tests/data/acpi/q35/AP= IC.dimmpxm similarity index 100% rename from tests/acpi-test-data/q35/APIC.dimmpxm rename to tests/data/acpi/q35/APIC.dimmpxm diff --git a/tests/acpi-test-data/q35/DSDT b/tests/data/acpi/q35/DSDT similarity index 100% rename from tests/acpi-test-data/q35/DSDT rename to tests/data/acpi/q35/DSDT diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/data/acpi/q35/DSD= T.bridge similarity index 100% rename from tests/acpi-test-data/q35/DSDT.bridge rename to tests/data/acpi/q35/DSDT.bridge diff --git a/tests/acpi-test-data/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.= cphp similarity index 100% rename from tests/acpi-test-data/q35/DSDT.cphp rename to tests/data/acpi/q35/DSDT.cphp diff --git a/tests/acpi-test-data/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DS= DT.dimmpxm similarity index 100% rename from tests/acpi-test-data/q35/DSDT.dimmpxm rename to tests/data/acpi/q35/DSDT.dimmpxm diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSD= T.ipmibt similarity index 100% rename from tests/acpi-test-data/q35/DSDT.ipmibt rename to tests/data/acpi/q35/DSDT.ipmibt diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT= .memhp similarity index 100% rename from tests/acpi-test-data/q35/DSDT.memhp rename to tests/data/acpi/q35/DSDT.memhp diff --git a/tests/acpi-test-data/q35/DSDT.numamem b/tests/data/acpi/q35/DS= DT.numamem similarity index 100% rename from tests/acpi-test-data/q35/DSDT.numamem rename to tests/data/acpi/q35/DSDT.numamem diff --git a/tests/acpi-test-data/q35/FACP b/tests/data/acpi/q35/FACP similarity index 100% rename from tests/acpi-test-data/q35/FACP rename to tests/data/acpi/q35/FACP diff --git a/tests/acpi-test-data/q35/FACS b/tests/data/acpi/q35/FACS similarity index 100% rename from tests/acpi-test-data/q35/FACS rename to tests/data/acpi/q35/FACS diff --git a/tests/acpi-test-data/q35/HPET b/tests/data/acpi/q35/HPET similarity index 100% rename from tests/acpi-test-data/q35/HPET rename to tests/data/acpi/q35/HPET diff --git a/tests/acpi-test-data/q35/MCFG b/tests/data/acpi/q35/MCFG similarity index 100% rename from tests/acpi-test-data/q35/MCFG rename to tests/data/acpi/q35/MCFG diff --git a/tests/acpi-test-data/q35/NFIT.dimmpxm b/tests/data/acpi/q35/NF= IT.dimmpxm similarity index 100% rename from tests/acpi-test-data/q35/NFIT.dimmpxm rename to tests/data/acpi/q35/NFIT.dimmpxm diff --git a/tests/acpi-test-data/q35/SLIT.cphp b/tests/data/acpi/q35/SLIT.= cphp similarity index 100% rename from tests/acpi-test-data/q35/SLIT.cphp rename to tests/data/acpi/q35/SLIT.cphp diff --git a/tests/acpi-test-data/q35/SLIT.memhp b/tests/data/acpi/q35/SLIT= .memhp similarity index 100% rename from tests/acpi-test-data/q35/SLIT.memhp rename to tests/data/acpi/q35/SLIT.memhp diff --git a/tests/acpi-test-data/q35/SRAT.cphp b/tests/data/acpi/q35/SRAT.= cphp similarity index 100% rename from tests/acpi-test-data/q35/SRAT.cphp rename to tests/data/acpi/q35/SRAT.cphp diff --git a/tests/acpi-test-data/q35/SRAT.dimmpxm b/tests/data/acpi/q35/SR= AT.dimmpxm similarity index 100% rename from tests/acpi-test-data/q35/SRAT.dimmpxm rename to tests/data/acpi/q35/SRAT.dimmpxm diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/data/acpi/q35/SRAT= .memhp similarity index 100% rename from tests/acpi-test-data/q35/SRAT.memhp rename to tests/data/acpi/q35/SRAT.memhp diff --git a/tests/acpi-test-data/q35/SRAT.numamem b/tests/data/acpi/q35/SR= AT.numamem similarity index 100% rename from tests/acpi-test-data/q35/SRAT.numamem rename to tests/data/acpi/q35/SRAT.numamem diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/data/acpi/q35/SS= DT.dimmpxm similarity index 100% rename from tests/acpi-test-data/q35/SSDT.dimmpxm rename to tests/data/acpi/q35/SSDT.dimmpxm diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/data/acpi= /rebuild-expected-aml.sh similarity index 86% rename from tests/acpi-test-data/rebuild-expected-aml.sh rename to tests/data/acpi/rebuild-expected-aml.sh index 11bf7439142..bf9ba242add 100755 --- a/tests/acpi-test-data/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -32,5 +32,3 @@ fi TEST_ACPI_REBUILD_AML=3Dy QTEST_QEMU_BINARY=3D$qemu tests/bios-tables-test =20 echo "The files were rebuilt and can be added to git." -echo "However, if new files were created, please copy them manually" \ - "to tests/acpi-test-data/pc/ or tests/acpi-test-data/q35/ ." --=20 2.19.1 From nobody Sun May 5 11:05:44 2024 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=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541159997955604.5564811602363; Fri, 2 Nov 2018 04:59:57 -0700 (PDT) Received: from localhost ([::1]:50957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY7D-0004qi-MS for importer@patchew.org; Fri, 02 Nov 2018 07:59:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY61-0004Gk-Cb for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:58:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIY5x-0007P6-FF for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:58:37 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52232) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIY5x-0007Or-5A for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:58:33 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gIY0L-0003Li-EB; Fri, 02 Nov 2018 11:52:45 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 11:52:37 +0000 Message-Id: <20181102115239.22485-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102115239.22485-1-peter.maydell@linaro.org> References: <20181102115239.22485-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2 for-3.1 2/4] tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/ 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: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently tests/hex-loader-check-data contains data files used by the hexloader-test, and configure individually symlinks those data files into the build directory using a wildcard. Using a wildcard like this is a bad idea, because if a new data file is added, nothing causes configure to be rerun, and so no symlink is added for the new file. This can cause tests to spuriously fail when they can't find their data. Instead, it's better to symlink an entire directory of data files. We already have such a directory: tests/data. Move the data files from tests/hex-loader-check-data/ to tests/data/hex-loader/, and remove the unnecessary symlinking. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- configure | 4 ---- tests/hexloader-test.c | 2 +- MAINTAINERS | 2 +- tests/{hex-loader-check-data =3D> data/hex-loader}/test.hex | 0 4 files changed, 2 insertions(+), 6 deletions(-) rename tests/{hex-loader-check-data =3D> data/hex-loader}/test.hex (100%) diff --git a/configure b/configure index 895b7483b8a..bfdca8b814e 100755 --- a/configure +++ b/configure @@ -7421,10 +7421,6 @@ for bios_file in \ do FILES=3D"$FILES pc-bios/$(basename $bios_file)" done -for test_file in $(find $source_path/tests/hex-loader-check-data -type f) -do - FILES=3D"$FILES tests/hex-loader-check-data$(echo $test_file | sed -e = 's/.*hex-loader-check-data//')" -done mkdir -p $DIRS for f in $FILES ; do if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" !=3D "y" ]; then diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c index b653d44ba10..834ed52c22b 100644 --- a/tests/hexloader-test.c +++ b/tests/hexloader-test.c @@ -23,7 +23,7 @@ static void hex_loader_test(void) const unsigned int base_addr =3D 0x00010000; =20 QTestState *s =3D qtest_initf( - "-M vexpress-a9 -nographic -device loader,file=3Dtests/hex-loader-= check-data/test.hex"); + "-M vexpress-a9 -nographic -device loader,file=3Dtests/data/hex-lo= ader/test.hex"); =20 for (i =3D 0; i < 256; ++i) { uint8_t val =3D qtest_readb(s, base_addr + i); diff --git a/MAINTAINERS b/MAINTAINERS index f2360efe3ed..5c342a670f5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1369,7 +1369,7 @@ Intel Hexadecimal Object File Loader M: Su Hang S: Maintained F: tests/hexloader-test.c -F: tests/hex-loader-check-data/test.hex +F: tests/data/hex-loader/test.hex =20 CHRP NVRAM M: Thomas Huth diff --git a/tests/hex-loader-check-data/test.hex b/tests/data/hex-loader/t= est.hex similarity index 100% rename from tests/hex-loader-check-data/test.hex rename to tests/data/hex-loader/test.hex --=20 2.19.1 From nobody Sun May 5 11:05:44 2024 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 154115977039797.08772296383427; Fri, 2 Nov 2018 04:56:10 -0700 (PDT) Received: from localhost ([::1]:50950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY3Y-0001m6-Pl for importer@patchew.org; Fri, 02 Nov 2018 07:56:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY0Q-0007V2-UU for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIY0P-0004IA-Ou for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:50 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIY0P-0004HS-GL for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:49 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gIY0M-0003Lz-GY; Fri, 02 Nov 2018 11:52:46 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 11:52:38 +0000 Message-Id: <20181102115239.22485-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102115239.22485-1-peter.maydell@linaro.org> References: <20181102115239.22485-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2 for-3.1 3/4] configure: Rename FILES variable to LINKS 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: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The FILES variable is used to accumulate a list of things to symlink from the source tree into the build tree. These don't have to be individual files; symlinking an entire directory of data files is also fine. Rename it to something less confusing before we add a few directories to it. Improve the comment to clarify what DIRS and LINKS do and why it's not a good idea to add things to LINKS with wildcarding. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- configure | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/configure b/configure index bfdca8b814e..52408ed3076 100755 --- a/configure +++ b/configure @@ -7392,22 +7392,31 @@ if test "$ccache_cpp2" =3D "yes"; then echo "export CCACHE_CPP2=3Dy" >> $config_host_mak fi =20 -# build tree in object directory in case the source is not in the current = directory +# If we're using a separate build tree, set it up now. +# DIRS are directories which we simply mkdir in the build tree; +# LINKS are things to symlink back into the source tree +# (these can be both files and directories). +# Caution: do not add files or directories here using wildcards. This +# will result in problems later if a new file matching the wildcard is +# added to the source tree -- nothing will cause configure to be rerun +# so the build tree will be missing the link back to the new file, and +# tests might fail. Prefer to keep the relevant files in their own +# directory and symlink the directory instead. DIRS=3D"tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/q= api-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" DIRS=3D"$DIRS tests/fp" DIRS=3D"$DIRS docs docs/interop fsdev scsi" DIRS=3D"$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS=3D"$DIRS roms/seabios roms/vgabios" -FILES=3D"Makefile tests/tcg/Makefile qdict-test-data.txt" -FILES=3D"$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES=3D"$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makef= ile" -FILES=3D"$FILES tests/fp/Makefile" -FILES=3D"$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" -FILES=3D"$FILES pc-bios/spapr-rtas/Makefile" -FILES=3D"$FILES pc-bios/s390-ccw/Makefile" -FILES=3D"$FILES roms/seabios/Makefile roms/vgabios/Makefile" -FILES=3D"$FILES pc-bios/qemu-icon.bmp" -FILES=3D"$FILES .gdbinit scripts" # scripts needed by relative path in .gd= binit +LINKS=3D"Makefile tests/tcg/Makefile qdict-test-data.txt" +LINKS=3D"$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" +LINKS=3D"$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makef= ile" +LINKS=3D"$LINKS tests/fp/Makefile" +LINKS=3D"$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS=3D"$LINKS pc-bios/spapr-rtas/Makefile" +LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" +LINKS=3D"$LINKS roms/seabios/Makefile roms/vgabios/Makefile" +LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" +LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ @@ -7419,10 +7428,10 @@ for bios_file in \ $source_path/pc-bios/u-boot.* \ $source_path/pc-bios/palcode-* do - FILES=3D"$FILES pc-bios/$(basename $bios_file)" + LINKS=3D"$LINKS pc-bios/$(basename $bios_file)" done mkdir -p $DIRS -for f in $FILES ; do +for f in $LINKS ; do if [ -e "$source_path/$f" ] && [ "$pwd_is_source_path" !=3D "y" ]; then symlink "$source_path/$f" "$f" fi --=20 2.19.1 From nobody Sun May 5 11:05:44 2024 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=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541159664044400.80181693862266; Fri, 2 Nov 2018 04:54:24 -0700 (PDT) Received: from localhost ([::1]:50937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY1l-0000Qq-5w for importer@patchew.org; Fri, 02 Nov 2018 07:54:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIY0P-0007PC-MY for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIY0O-0004Hn-Oz for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:49 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gIY0O-0004HS-Gs for qemu-devel@nongnu.org; Fri, 02 Nov 2018 07:52:48 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gIY0N-0003MF-JB; Fri, 02 Nov 2018 11:52:47 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 11:52:39 +0000 Message-Id: <20181102115239.22485-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102115239.22485-1-peter.maydell@linaro.org> References: <20181102115239.22485-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2 for-3.1 4/4] configure: Use LINKS loop for all build tree symlinks 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: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" A few places in configure were doing ad-hoc calls to the symlink function to set up symlinks from the build tree back to the source tree. We have a loop that does this already for all files and directories listed in the LINKS environment variable; use that instead. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- configure | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 52408ed3076..74e313a8101 100755 --- a/configure +++ b/configure @@ -7417,6 +7417,8 @@ LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile roms/vgabios/Makefile" LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit +LINKS=3D"$LINKS tests/acceptance tests/data" +LINKS=3D"$LINKS tests/qemu-iotests/check" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ @@ -7453,25 +7455,13 @@ for rom in seabios vgabios ; do echo "RANLIB=3D$ranlib" >> $config_mak done =20 -# set up tests data directory -for tests_subdir in acceptance data; do - if [ ! -e tests/$tests_subdir ]; then - symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir - fi -done - # set up qemu-iotests in this build directory iotests_common_env=3D"tests/qemu-iotests/common.env" -iotests_check=3D"tests/qemu-iotests/check" =20 echo "# Automatically generated by configure - do not modify" > "$iotests_= common_env" echo >> "$iotests_common_env" echo "export PYTHON=3D'$python'" >> "$iotests_common_env" =20 -if [ ! -e "$iotests_check" ]; then - symlink "$source_path/$iotests_check" "$iotests_check" -fi - # Save the configure command line for later reuse. cat <config.status #!/bin/sh --=20 2.19.1