From patchwork Mon Nov 5 18:14:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 150220 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2934972ljp; Mon, 5 Nov 2018 10:21:06 -0800 (PST) X-Google-Smtp-Source: AJdET5d8/CyjpY3wV0ViVpO+XhCkO0sxTtZXDXen2cESp98vIeTnDPmGwYSDVMMP3a08qo+1uPLr X-Received: by 2002:a37:7845:: with SMTP id t66mr15804109qkc.103.1541442066201; Mon, 05 Nov 2018 10:21:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541442066; cv=none; d=google.com; s=arc-20160816; b=tu5Ji3aK5GDrqo1HBbfkWEAV4lqnQpPudwbDXS+7OOdJcDibDIMm+kLowZDR3dfuvM w6Sqgw+wPaM0HO9i5UqYWmfco4agA25Zf8ACy0LgA3VYmY+n+7tLfbb/ZpNipQUyG7Jd 7jmEklxrnjBkBhMa1S09c42Tq0WkBQl0++sGSgLEtaOIEbLi9e/9mHxNsu0Ue7Gb8S28 uSzSSHeJxG26NOKAdO7N/nQYS+ztNbn73oAnRiBGMyKpvKpMO39TpodHUP2awo5a9qP1 N8ADKKuXsZSnRX4Jpwjp8dC+Y/CzyujZ420Bpx4nZ5HcnIxh+Mu4hbI3qXqEYoZFTZ5G iD4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:in-reply-to :content-disposition:mime-version:references:message-id:to:from:date; bh=a6iOCZlRzvz8NomlIOqx+4qaQ3JShzOyBC0wxq/H/r8=; b=mpM4of9JpL5ALUtXY4hMXpdHZkoVOlqJszIGjWJcL47eoiIQu4zSkgneVbcUfhkxeX AGE6fu/50ln3GtUMnRPQIaxzLJoCJ9vD1jhLUzlbovpJvVxf5UGhnuwV1s/Bdllq7Vig w6FnR+zopMwrfik74ieI892W9WLnFp3MdGJQIl1ielSNhJlEma+RZBUWvZBwY5op3BgV HT/o7zlQPRNU0qkvW2YZkTjCBLJuAXXOAKkb50eKVPxtNh8PW8okMl8TUQgDQ4oz5F8Q KN+JnWrsiJCvmHRKMjt3iTSG97jTat7kI8hcASFc34JH3SqxYNiGrj6szwijcWIbtgSW j7bA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s33si1985091qts.306.2018.11.05.10.21.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Nov 2018 10:21:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjUn-0003zr-Ib for patch@linaro.org; Mon, 05 Nov 2018 13:21:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjOY-0005za-Lj for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJjOU-0000ft-2i for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJjOT-0000d6-L9 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:33 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BFE3A307DAB0; Mon, 5 Nov 2018 18:14:32 +0000 (UTC) Received: from redhat.com (ovpn-121-251.rdu2.redhat.com [10.10.121.251]) by smtp.corp.redhat.com (Postfix) with SMTP id E369C19748; Mon, 5 Nov 2018 18:14:31 +0000 (UTC) Date: Mon, 5 Nov 2018 13:14:31 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20181105181353.39804-2-mst@redhat.com> References: <20181105181353.39804-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181105181353.39804-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 05 Nov 2018 18:14:32 +0000 (UTC) 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 01/33] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 --- configure | 4 ---- tests/bios-tables-test.c | 2 +- tests/{acpi-test-data => data/acpi}/pc/APIC | Bin tests/{acpi-test-data => data/acpi}/pc/APIC.cphp | Bin tests/{acpi-test-data => data/acpi}/pc/APIC.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.bridge | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.cphp | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.ipmikcs | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.memhp | Bin tests/{acpi-test-data => data/acpi}/pc/DSDT.numamem | Bin tests/{acpi-test-data => data/acpi}/pc/FACP | Bin tests/{acpi-test-data => data/acpi}/pc/FACS | Bin tests/{acpi-test-data => data/acpi}/pc/HPET | Bin tests/{acpi-test-data => data/acpi}/pc/NFIT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/pc/SLIT.cphp | Bin tests/{acpi-test-data => data/acpi}/pc/SLIT.memhp | Bin tests/{acpi-test-data => data/acpi}/pc/SRAT.cphp | Bin tests/{acpi-test-data => data/acpi}/pc/SRAT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/pc/SRAT.memhp | Bin tests/{acpi-test-data => data/acpi}/pc/SRAT.numamem | Bin tests/{acpi-test-data => data/acpi}/pc/SSDT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/q35/APIC | Bin tests/{acpi-test-data => data/acpi}/q35/APIC.cphp | Bin .../{acpi-test-data => data/acpi}/q35/APIC.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/q35/DSDT | Bin tests/{acpi-test-data => data/acpi}/q35/DSDT.bridge | Bin tests/{acpi-test-data => data/acpi}/q35/DSDT.cphp | Bin .../{acpi-test-data => data/acpi}/q35/DSDT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/q35/DSDT.ipmibt | Bin tests/{acpi-test-data => data/acpi}/q35/DSDT.memhp | Bin .../{acpi-test-data => data/acpi}/q35/DSDT.numamem | Bin tests/{acpi-test-data => data/acpi}/q35/FACP | Bin tests/{acpi-test-data => data/acpi}/q35/FACS | Bin tests/{acpi-test-data => data/acpi}/q35/HPET | Bin tests/{acpi-test-data => data/acpi}/q35/MCFG | Bin .../{acpi-test-data => data/acpi}/q35/NFIT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/q35/SLIT.cphp | Bin tests/{acpi-test-data => data/acpi}/q35/SLIT.memhp | Bin tests/{acpi-test-data => data/acpi}/q35/SRAT.cphp | Bin .../{acpi-test-data => data/acpi}/q35/SRAT.dimmpxm | Bin tests/{acpi-test-data => data/acpi}/q35/SRAT.memhp | Bin .../{acpi-test-data => data/acpi}/q35/SRAT.numamem | Bin .../{acpi-test-data => data/acpi}/q35/SSDT.dimmpxm | Bin .../acpi}/rebuild-expected-aml.sh | 2 -- 46 files changed, 1 insertion(+), 7 deletions(-) rename tests/{acpi-test-data => data/acpi}/pc/APIC (100%) rename tests/{acpi-test-data => data/acpi}/pc/APIC.cphp (100%) rename tests/{acpi-test-data => data/acpi}/pc/APIC.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.bridge (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.ipmikcs (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/pc/DSDT.numamem (100%) rename tests/{acpi-test-data => data/acpi}/pc/FACP (100%) rename tests/{acpi-test-data => data/acpi}/pc/FACS (100%) rename tests/{acpi-test-data => data/acpi}/pc/HPET (100%) rename tests/{acpi-test-data => data/acpi}/pc/NFIT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/pc/SLIT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/pc/SLIT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/pc/SRAT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/pc/SRAT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/pc/SRAT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/pc/SRAT.numamem (100%) rename tests/{acpi-test-data => data/acpi}/pc/SSDT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/q35/APIC (100%) rename tests/{acpi-test-data => data/acpi}/q35/APIC.cphp (100%) rename tests/{acpi-test-data => data/acpi}/q35/APIC.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.bridge (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.ipmibt (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/q35/DSDT.numamem (100%) rename tests/{acpi-test-data => data/acpi}/q35/FACP (100%) rename tests/{acpi-test-data => data/acpi}/q35/FACS (100%) rename tests/{acpi-test-data => data/acpi}/q35/HPET (100%) rename tests/{acpi-test-data => data/acpi}/q35/MCFG (100%) rename tests/{acpi-test-data => data/acpi}/q35/NFIT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/q35/SLIT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/q35/SLIT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/q35/SRAT.cphp (100%) rename tests/{acpi-test-data => data/acpi}/q35/SRAT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/q35/SRAT.memhp (100%) rename tests/{acpi-test-data => data/acpi}/q35/SRAT.numamem (100%) rename tests/{acpi-test-data => data/acpi}/q35/SSDT.dimmpxm (100%) rename tests/{acpi-test-data => data/acpi}/rebuild-expected-aml.sh (86%) -- MST diff --git a/configure b/configure index 46ae1e8c76..895b7483b8 100755 --- a/configure +++ b/configure @@ -7421,10 +7421,6 @@ for bios_file in \ do FILES="$FILES pc-bios/$(basename $bios_file)" done -for test_file in $(find $source_path/tests/acpi-test-data -type f) -do - FILES="$FILES tests/acpi-test-data$(echo $test_file | sed -e 's/.*acpi-test-data//')" -done for test_file in $(find $source_path/tests/hex-loader-check-data -type f) do FILES="$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 02e77ec811..b14c8eaa17 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -42,7 +42,7 @@ typedef struct { } test_data; static char disk[] = "tests/acpi-test-disk-XXXXXX"; -static const char *data_dir = "tests/acpi-test-data"; +static const char *data_dir = "tests/data/acpi"; #ifdef CONFIG_IASL static const char *iasl = 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.cphp 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.cphp 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.memhp 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.cphp 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.memhp 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.cphp 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.memhp 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/APIC.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/DSDT.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/DSDT.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/DSDT.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/DSDT.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/NFIT.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/SRAT.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/SRAT.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/SSDT.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 11bf743914..bf9ba242ad 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=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test 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/ ." From patchwork Mon Nov 5 18:14:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 150221 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2935232ljp; Mon, 5 Nov 2018 10:21:24 -0800 (PST) X-Google-Smtp-Source: AJdET5fm7Sas07VrNKo+Goe7C/XUc5JHMvQHeqsccJlKU+GgKVIps/El3Qe787+mMLTCJw8iqB5T X-Received: by 2002:a37:9604:: with SMTP id y4mr13727249qkd.279.1541442084699; Mon, 05 Nov 2018 10:21:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541442084; cv=none; d=google.com; s=arc-20160816; b=TJV5uBFn5YixPxi4U2A/CCCYn7IYkrIEgzgCgUKKvnVrrWzfQmkS5hz6JDjuNkHgX7 pWXPJFbAzjICqHrxZPcwGlWtxx/7MMyjuWlPEfio20kzy2VHZJnYSWuztKkYOIedtIUW lRzDbRQ8sOZtx7b9GUgWoqplm7K/U89jGpVd7uzfNO9AV3014oxf6hYVZR6NeBOj9bMq 4ApusUkzje2HGaeQ0XI3E48LEUkZ3Lk7WGg8TpQ/TfSWxFPGI+OJOlstfwEOrITiqeIx L+WLUrfxZT2murPLV2Mp2xHO4TTOtKrWCSpfCOSvxXWWakYhMeSSMFqWv+gB7NJVoA0E vJSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:in-reply-to :content-disposition:mime-version:references:message-id:to:from:date; bh=UIP5zJ82Zof7xzMM76hUn1qPsPS7wIK963PBuGByuZA=; b=kovlx7bvHGu2wzW18jHcn67WqCqVIHycs+z46npX/8LnWxh8GYBKw38rZivpY0a5w5 QM7utNSqEuyIZe27DJlpl70UYwHuMWy8eBdmfwxx2JwWB6mcomDoSOd87JZ5z51yYuGv ovGXjddmQht6VbztgEw0t0WQXX7+M3777Ln1TBfKhpAs/0HP7vbEzVRL9RS6WI1Uq5zq A5bxezQb7cb5YV59+4y1MhMuwjFCJuuwRjZbteOmzGXU+2xsLvm9SlTe/uNFo27YJfw7 BIfVWO/6h2RRcaNa85nmgRt0vN7HzJoGC8achl8WGHLCztYGmDXwcBxfOeLx4GcmHy3c GVdA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y203-v6si4553870qka.140.2018.11.05.10.21.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Nov 2018 10:21:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjV6-00050p-2D for patch@linaro.org; Mon, 05 Nov 2018 13:21:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjOY-0005zS-HI for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJjOW-0000l0-Fu for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJjOW-0000iS-4r for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:36 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48FC683F51; Mon, 5 Nov 2018 18:14:34 +0000 (UTC) Received: from redhat.com (ovpn-121-251.rdu2.redhat.com [10.10.121.251]) by smtp.corp.redhat.com (Postfix) with SMTP id 440755DD72; Mon, 5 Nov 2018 18:14:33 +0000 (UTC) Date: Mon, 5 Nov 2018 13:14:32 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20181105181353.39804-3-mst@redhat.com> References: <20181105181353.39804-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181105181353.39804-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 05 Nov 2018 18:14:35 +0000 (UTC) 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 02/33] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Su Hang , Paolo Bonzini Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 --- configure | 4 ---- tests/hexloader-test.c | 2 +- MAINTAINERS | 2 +- tests/{hex-loader-check-data => data/hex-loader}/test.hex | 0 4 files changed, 2 insertions(+), 6 deletions(-) rename tests/{hex-loader-check-data => data/hex-loader}/test.hex (100%) -- MST diff --git a/configure b/configure index 895b7483b8..bfdca8b814 100755 --- a/configure +++ b/configure @@ -7421,10 +7421,6 @@ for bios_file in \ do FILES="$FILES pc-bios/$(basename $bios_file)" done -for test_file in $(find $source_path/tests/hex-loader-check-data -type f) -do - FILES="$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" != "y" ]; then diff --git a/tests/hexloader-test.c b/tests/hexloader-test.c index b653d44ba1..834ed52c22 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 = 0x00010000; QTestState *s = qtest_initf( - "-M vexpress-a9 -nographic -device loader,file=tests/hex-loader-check-data/test.hex"); + "-M vexpress-a9 -nographic -device loader,file=tests/data/hex-loader/test.hex"); for (i = 0; i < 256; ++i) { uint8_t val = qtest_readb(s, base_addr + i); diff --git a/MAINTAINERS b/MAINTAINERS index 98a1856afc..cfabc14b59 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1370,7 +1370,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 CHRP NVRAM M: Thomas Huth diff --git a/tests/hex-loader-check-data/test.hex b/tests/data/hex-loader/test.hex similarity index 100% rename from tests/hex-loader-check-data/test.hex rename to tests/data/hex-loader/test.hex From patchwork Mon Nov 5 18:14:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 150219 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2931941ljp; Mon, 5 Nov 2018 10:18:00 -0800 (PST) X-Google-Smtp-Source: AJdET5erWtHdYFVWG277oIrS/Izl4opKPQ0Bo8ZgqlM3jmEz9VD3iReSmw4MPXn9UxPsyDfmyCR0 X-Received: by 2002:a37:5906:: with SMTP id n6-v6mr21340059qkb.73.1541441880640; Mon, 05 Nov 2018 10:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541441880; cv=none; d=google.com; s=arc-20160816; b=Nm/RgatL/K+IBAEfUOB5Gwl/mzTr555ia22yploHQbAO9eMjGAQayCvEfw5ZchbkUY JT1VBmQtJqdHPxzBlknlBx02a4c6AdTdmhKdAlrI9Sg/gUFK85GyQZLMWtyiZ8zlVOl6 UJzLcYYmgJ0O2LZwVdMRomEAqi+L0Qz0HLPuKhMyhUYBtLJ2cG8xAyX4uPfacz2cMxiX LKDEQiRNZqtqG3i1ygurk+p7K9VCw/vJL+rpOkM5ArzAZT2RW/tnvcMsf6NOpkL+HXQ/ ur3hw1t2VhF2kP75RZoNI4wVniFCtH8FPLemzuzEDUQ0WXLJvSwtSgBQKWlpfxDnmWoa DwzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:in-reply-to :content-disposition:mime-version:references:message-id:to:from:date; bh=z9TnIR/dyVThYWuW2zs0iz94ZqWkYM0QQn60fQLGqNc=; b=h2397eoWC4xwZoSXtyYcX4ByeA94v3knRT59m4+8KyovUvuB+sX7FB/SqFF5SDhVbv rKipDI6o3T1KIO4upChXSgB2XBO8k9AZO+5kNmcOBCS0pJ9SGVtloXwGioWj/LpOszeV f/zGaM1IZmbE+02J3B307VZtB7pjtHJ2BdXCdQWr+YvmQZ8wCHS9OIn4Cx1dO9111i/v 6AZ+8iliWDcmFrR0mAwrpupLdF7MoT4XAwRAzY5dZ5WuiJ4mHFxHAJIwD46Vq+jQAa2V 3HrD9hPZNvQxDjCBEbRPnutVF7+vA7wrJ8GFGAloNuX4MfWvRBQ/tcnx14i38l0b16sU 3Lbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s34si859280qtb.17.2018.11.05.10.18.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Nov 2018 10:18:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjRn-0000md-VL for patch@linaro.org; Mon, 05 Nov 2018 13:18:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59834) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjOe-00065B-Kk for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJjOd-0000xH-7R for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35322) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJjOc-0000ws-U9 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:14:43 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 38BDC368E7; Mon, 5 Nov 2018 18:14:42 +0000 (UTC) Received: from redhat.com (ovpn-121-251.rdu2.redhat.com [10.10.121.251]) by smtp.corp.redhat.com (Postfix) with SMTP id B5F04600D6; Mon, 5 Nov 2018 18:14:34 +0000 (UTC) Date: Mon, 5 Nov 2018 13:14:34 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20181105181353.39804-4-mst@redhat.com> References: <20181105181353.39804-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181105181353.39804-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 05 Nov 2018 18:14:42 +0000 (UTC) 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/33] 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: Peter Maydell , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 --- configure | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) -- MST diff --git a/configure b/configure index bfdca8b814..52408ed307 100755 --- a/configure +++ b/configure @@ -7392,22 +7392,31 @@ if test "$ccache_cpp2" = "yes"; then echo "export CCACHE_CPP2=y" >> $config_host_mak fi -# 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="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm" DIRS="$DIRS tests/fp" DIRS="$DIRS docs docs/interop fsdev scsi" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" -FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" -FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" -FILES="$FILES tests/fp/Makefile" -FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" -FILES="$FILES pc-bios/spapr-rtas/Makefile" -FILES="$FILES pc-bios/s390-ccw/Makefile" -FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" -FILES="$FILES pc-bios/qemu-icon.bmp" -FILES="$FILES .gdbinit scripts" # scripts needed by relative path in .gdbinit +LINKS="Makefile tests/tcg/Makefile qdict-test-data.txt" +LINKS="$LINKS tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" +LINKS="$LINKS tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/Makefile" +LINKS="$LINKS tests/fp/Makefile" +LINKS="$LINKS pc-bios/optionrom/Makefile pc-bios/keymaps" +LINKS="$LINKS pc-bios/spapr-rtas/Makefile" +LINKS="$LINKS pc-bios/s390-ccw/Makefile" +LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile" +LINKS="$LINKS pc-bios/qemu-icon.bmp" +LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit 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="$FILES pc-bios/$(basename $bios_file)" + LINKS="$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" != "y" ]; then symlink "$source_path/$f" "$f" fi From patchwork Mon Nov 5 18:14:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 150222 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2936042ljp; Mon, 5 Nov 2018 10:22:19 -0800 (PST) X-Google-Smtp-Source: AJdET5fbsxhbQgS6cXFatMNndv0h6nYapFlWtKLvfXmDKJsbZJAAL+nw4PT3Q0mWes+P7lESinei X-Received: by 2002:ac8:3e91:: with SMTP id y17-v6mr21739863qtf.314.1541442139269; Mon, 05 Nov 2018 10:22:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541442139; cv=none; d=google.com; s=arc-20160816; b=e9apOiCSiP1QHvad+VhH+kvR9Cc7YEq9TeYPHv6rAP7ePCsyiEBgI4jP9ynXQT5wkC xS7alvAWNOmT+yGN/EkUc+A4SJwttEzIufgWyNOqMDeyrUGE3Wr4FyrS4GSc57KJCP5J cJJrlIgYzYAdywoADvp7bRtW4w32N2/NGqeG8qeju8Lsd0xEtNKt/B2QPuglOKxak93E exq5UyxQVdug1Racgm5FQpu7KQ5vXH+5rMt0N9e6T/a+jTh725fXcIfyFOYsUEdvFZda AqJKfPswIgv4q1O1AA3vjwicaVQz6PqXphaVrysbnmoCMEHCDcnKPX3ygMisLONASGOP 4GVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:in-reply-to :content-disposition:mime-version:references:message-id:to:from:date; bh=8NEMDiw8zjChuX0CnA9mpWlIruX5h5iv1PGX5fL/mcg=; b=KHUOh6YL2JuwG62G3UHagZIzl7zM3mWAK5xCnPHqpKI1AYGM9D6RL3OJB8QlioVoI0 GSC3D7b69sgS40jdkVrJl59D10VKcEQd/ud29E8cHIWAJ8GaDKRP65l9kAskeW5EDQL/ TqaK1p1Kih8VO0IsJZrRmcYSJDuLvLwFDqQOokhnGpsmVrz68FRvbJC70JHjsRU5HTgj Y+nF2YzSn3Kl9AlI5v6imu/nQDmOLa/LBQZGIq/VjTKC1nIP6gDRGPofgHnMul6XaL2d vqyucQtOSHGlvtm7NZgyIQLHUgHBaMlZpi30hECX8PEjodHB/W+WJmR/q1vnRPOpXmn4 uK1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s31si3771282qvj.140.2018.11.05.10.22.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 05 Nov 2018 10:22:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjVy-0007tB-Kp for patch@linaro.org; Mon, 05 Nov 2018 13:22:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJjOz-0006P3-VX for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:15:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJjOx-0001GK-72 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:15:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3104) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJjOw-0001Fz-W7 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 13:15:03 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 35F713084022; Mon, 5 Nov 2018 18:15:02 +0000 (UTC) Received: from redhat.com (ovpn-121-251.rdu2.redhat.com [10.10.121.251]) by smtp.corp.redhat.com (Postfix) with SMTP id BA73860BF2; Mon, 5 Nov 2018 18:14:47 +0000 (UTC) Date: Mon, 5 Nov 2018 13:14:42 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20181105181353.39804-5-mst@redhat.com> References: <20181105181353.39804-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181105181353.39804-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 05 Nov 2018 18:15:02 +0000 (UTC) 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 04/33] 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: Peter Maydell , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , =?utf-8?q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 --- configure | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) -- MST diff --git a/configure b/configure index 52408ed307..74e313a810 100755 --- a/configure +++ b/configure @@ -7417,6 +7417,8 @@ LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile" LINKS="$LINKS pc-bios/qemu-icon.bmp" LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit +LINKS="$LINKS tests/acceptance tests/data" +LINKS="$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=$ranlib" >> $config_mak done -# 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="tests/qemu-iotests/common.env" -iotests_check="tests/qemu-iotests/check" echo "# Automatically generated by configure - do not modify" > "$iotests_common_env" echo >> "$iotests_common_env" echo "export PYTHON='$python'" >> "$iotests_common_env" -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