[Qemu-devel] [PATCH v2 for-3.1 0/4] configure: symlink directories, not wildcarded files

[Qemu-devel] [PATCH v2 for-3.1 0/4] configure: symlink directories, not wildcarded files

[Peter Maydell]

This patchset fixes a problem with our build infrastructure
that meant that MST's recent 'pci, pc, virtio' pullreq failed
tests.

Currently our configure script has a wildcard loop that creates
symlinks for every data file in tests/acpi-test-data from the
source tree to the build tree. However, if a new data file is
added in git, there is nothing that causes configure to be rerun,
and so it is not available in the build tree, which can cause
test failures.

In v1 of this patchset I addressed this by changing configure
to make tests/acpi-test-data itself a symlink. Unfortunately
this has an awkward consequence that 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.
So instead in v2, we move all the data files to the tests/data/
directory. tests/data/ is already symlinked as a directory,
so there is no problem for bisection.

Patch 1 does that for tests/acpi-test-data.
Patch 2 does that for tests/hex-loader-check-data.
Patch 3 is a cleanup, renaming a variable and adding
documentation so that it's clearer that symlinking can
be used for directories and that wildcarding files is bad.
Patch 4 rolls some ad-hoc symlinking into the common loop.

We do still use wildcarding to construct a list of files in
pc-bios to be symlinked; we get away with this because we don't
in practice add new BIOS images often and if we do there's also
usually a change that means configure is rerun anyway. We can't
just symlink all of pc-bios into the build tree because it
contains other things than just generated binaries. There
might be scope for fixing this, but I wanted to get this fix out.

thanks
-- PMM

Peter Maydell (4):
  tests: Move tests/acpi-test-data/ to tests/data/acpi/
  tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/
  configure: Rename FILES variable to LINKS
  configure: Use LINKS loop for all build tree symlinks

 configure                                     |  57 ++++++++----------
 tests/bios-tables-test.c                      |   2 +-
 tests/hexloader-test.c                        |   2 +-
 MAINTAINERS                                   |   2 +-
 tests/{acpi-test-data => data/acpi}/pc/APIC   | Bin
 .../acpi}/pc/APIC.cphp                        | Bin
 .../acpi}/pc/APIC.dimmpxm                     | Bin
 tests/{acpi-test-data => data/acpi}/pc/DSDT   | Bin
 .../acpi}/pc/DSDT.bridge                      | Bin
 .../acpi}/pc/DSDT.cphp                        | Bin
 .../acpi}/pc/DSDT.dimmpxm                     | Bin
 .../acpi}/pc/DSDT.ipmikcs                     | Bin
 .../acpi}/pc/DSDT.memhp                       | Bin
 .../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
 .../acpi}/pc/NFIT.dimmpxm                     | Bin
 .../acpi}/pc/SLIT.cphp                        | Bin
 .../acpi}/pc/SLIT.memhp                       | Bin
 .../acpi}/pc/SRAT.cphp                        | Bin
 .../acpi}/pc/SRAT.dimmpxm                     | Bin
 .../acpi}/pc/SRAT.memhp                       | Bin
 .../acpi}/pc/SRAT.numamem                     | Bin
 .../acpi}/pc/SSDT.dimmpxm                     | Bin
 tests/{acpi-test-data => data/acpi}/q35/APIC  | Bin
 .../acpi}/q35/APIC.cphp                       | Bin
 .../acpi}/q35/APIC.dimmpxm                    | Bin
 tests/{acpi-test-data => data/acpi}/q35/DSDT  | Bin
 .../acpi}/q35/DSDT.bridge                     | Bin
 .../acpi}/q35/DSDT.cphp                       | Bin
 .../acpi}/q35/DSDT.dimmpxm                    | Bin
 .../acpi}/q35/DSDT.ipmibt                     | Bin
 .../acpi}/q35/DSDT.memhp                      | Bin
 .../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}/q35/NFIT.dimmpxm                    | Bin
 .../acpi}/q35/SLIT.cphp                       | Bin
 .../acpi}/q35/SLIT.memhp                      | Bin
 .../acpi}/q35/SRAT.cphp                       | Bin
 .../acpi}/q35/SRAT.dimmpxm                    | Bin
 .../acpi}/q35/SRAT.memhp                      | Bin
 .../acpi}/q35/SRAT.numamem                    | Bin
 .../acpi}/q35/SSDT.dimmpxm                    | Bin
 .../acpi}/rebuild-expected-aml.sh             |   2 -
 .../hex-loader}/test.hex                      |   0
 49 files changed, 27 insertions(+), 38 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%)
 rename tests/{hex-loader-check-data => data/hex-loader}/test.hex (100%)

-- 
2.19.1

[Qemu-devel] [PATCH v2 for-3.1 1/4] tests: Move tests/acpi-test-data/ to tests/data/acpi/

[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 <peter.maydell@linaro.org>
---
 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%)

diff --git a/configure b/configure
index 46ae1e8c767..895b7483b8a 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 02e77ec811b..b14c8eaa171 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 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=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/ ."
-- 
2.19.1

[Qemu-devel] [PATCH v2 for-3.1 2/4] tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/

[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 <peter.maydell@linaro.org>
---
 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%)

diff --git a/configure b/configure
index 895b7483b8a..bfdca8b814e 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 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 = 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 f2360efe3ed..5c342a670f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1369,7 +1369,7 @@ Intel Hexadecimal Object File Loader
 M: Su Hang <suhang16@mails.ucas.ac.cn>
 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 <thuth@redhat.com>
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
-- 
2.19.1

[Qemu-devel] [PATCH v2 for-3.1 3/4] configure: Rename FILES variable to LINKS

[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 <peter.maydell@linaro.org>
---
 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" = "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
-- 
2.19.1

[Qemu-devel] [PATCH v2 for-3.1 4/4] configure: Use LINKS loop for all build tree symlinks

[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 <peter.maydell@linaro.org>
---
 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="$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 <<EOD >config.status
 #!/bin/sh
-- 
2.19.1

Re: [Qemu-devel] [PATCH v2 for-3.1 1/4] tests: Move tests/acpi-test-data/ to tests/data/acpi/

[Philippe Mathieu-Daudé]

Hi Peter,

On 2/11/18 12:52, Peter Maydell wrote:
> 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.

This doesn't seem true for out-of-tree builds.

> 
> (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 <peter.maydell@linaro.org>
> ---
>   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%)
> 
> diff --git a/configure b/configure
> index 46ae1e8c767..895b7483b8a 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 02e77ec811b..b14c8eaa171 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 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=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/ ."
>

Re: [Qemu-devel] [PATCH v2 for-3.1 0/4] configure: symlink directories, not wildcarded files

[Philippe Mathieu-Daudé]

On 2/11/18 12:52, Peter Maydell wrote:
> This patchset fixes a problem with our build infrastructure
> that meant that MST's recent 'pci, pc, virtio' pullreq failed
> tests.
> 
> Currently our configure script has a wildcard loop that creates
> symlinks for every data file in tests/acpi-test-data from the
> source tree to the build tree. However, if a new data file is
> added in git, there is nothing that causes configure to be rerun,
> and so it is not available in the build tree, which can cause
> test failures.
> 
> In v1 of this patchset I addressed this by changing configure
> to make tests/acpi-test-data itself a symlink. Unfortunately
> this has an awkward consequence that 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.
> So instead in v2, we move all the data files to the tests/data/
> directory. tests/data/ is already symlinked as a directory,
> so there is no problem for bisection.
> 
> Patch 1 does that for tests/acpi-test-data.
> Patch 2 does that for tests/hex-loader-check-data.
> Patch 3 is a cleanup, renaming a variable and adding
> documentation so that it's clearer that symlinking can
> be used for directories and that wildcarding files is bad.
> Patch 4 rolls some ad-hoc symlinking into the common loop.
> 
> We do still use wildcarding to construct a list of files in
> pc-bios to be symlinked; we get away with this because we don't
> in practice add new BIOS images often and if we do there's also
> usually a change that means configure is rerun anyway. We can't
> just symlink all of pc-bios into the build tree because it
> contains other things than just generated binaries. There
> might be scope for fixing this, but I wanted to get this fix out.
> 
> thanks
> -- PMM
> 
> Peter Maydell (4):
>    tests: Move tests/acpi-test-data/ to tests/data/acpi/
>    tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/
>    configure: Rename FILES variable to LINKS
>    configure: Use LINKS loop for all build tree symlinks

I left one comment about when using rebuild-expected-aml.sh
in out-of-tree builds. Anyway for the series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [Qemu-devel] [PATCH v2 for-3.1 1/4] tests: Move tests/acpi-test-data/ to tests/data/acpi/

[Peter Maydell]

On 2 November 2018 at 17:38, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
> Hi Peter,
>
> On 2/11/18 12:52, Peter Maydell wrote:
>> 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.
>
>
> This doesn't seem true for out-of-tree builds.

In the old setup, running the rebuild-expected-aml.sh
script is done in the build directory, and creates new
data files in ./tests/acpi-test-data/, which must then be
copied to the source directory.
In the new setup, the script is still run in the build
directory, but when new data files are created in
./tests/data/acpi/ they don't need to be copied anywhere,
because the directory symlink means they're already in
tests/data/acpi in the source directory structure.

thanks
-- PMM

Re: [Qemu-devel] [PATCH v2 for-3.1 1/4] tests: Move tests/acpi-test-data/ to tests/data/acpi/

[Philippe Mathieu-Daudé]

On 2/11/18 18:42, Peter Maydell wrote:
> On 2 November 2018 at 17:38, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>> Hi Peter,
>>
>> On 2/11/18 12:52, Peter Maydell wrote:
>>> 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.
>>
>>
>> This doesn't seem true for out-of-tree builds.
> 
> In the old setup, running the rebuild-expected-aml.sh
> script is done in the build directory, and creates new
> data files in ./tests/acpi-test-data/, which must then be
> copied to the source directory.
> In the new setup, the script is still run in the build
> directory, but when new data files are created in
> ./tests/data/acpi/ they don't need to be copied anywhere,
> because the directory symlink means they're already in
> tests/data/acpi in the source directory structure.

Oh you are correct...
My other terminal output was not update and was displaying the inodes 
from a previous run. No problem then!

Thanks,

Phil.