tests: Move tests/acpi-test-data/ to tests/data/acpi/

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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

44 files changed, 0 insertions, 36 deletions

diff --git a/tests/acpi-test-data/pc/APIC b/tests/acpi-test-data/pc/APIC
deleted file mode 100644
index 84509e0ae4..0000000000
--- a/tests/acpi-test-data/pc/APIC
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/APIC.cphp b/tests/acpi-test-data/pc/APIC.cphp
deleted file mode 100644
index 1bf8a0a63b..0000000000
--- a/tests/acpi-test-data/pc/APIC.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/APIC.dimmpxm b/tests/acpi-test-data/pc/APIC.dimmpxm
deleted file mode 100644
index 427bb08248..0000000000
--- a/tests/acpi-test-data/pc/APIC.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
deleted file mode 100644
index c6adfe32d5..0000000000
--- a/tests/acpi-test-data/pc/DSDT
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge
deleted file mode 100644
index f01fa3ad4e..0000000000
--- a/tests/acpi-test-data/pc/DSDT.bridge
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.cphp b/tests/acpi-test-data/pc/DSDT.cphp
deleted file mode 100644
index 3295d81c7f..0000000000
--- a/tests/acpi-test-data/pc/DSDT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.dimmpxm b/tests/acpi-test-data/pc/DSDT.dimmpxm
deleted file mode 100644
index f6ec911b11..0000000000
--- a/tests/acpi-test-data/pc/DSDT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.ipmikcs b/tests/acpi-test-data/pc/DSDT.ipmikcs
deleted file mode 100644
index 2633a8cecf..0000000000
--- a/tests/acpi-test-data/pc/DSDT.ipmikcs
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.memhp b/tests/acpi-test-data/pc/DSDT.memhp
deleted file mode 100644
index e31ef50296..0000000000
--- a/tests/acpi-test-data/pc/DSDT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/DSDT.numamem b/tests/acpi-test-data/pc/DSDT.numamem
deleted file mode 100644
index 71a975b3e2..0000000000
--- a/tests/acpi-test-data/pc/DSDT.numamem
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/FACP b/tests/acpi-test-data/pc/FACP
deleted file mode 100644
index 261ebdc5d1..0000000000
--- a/tests/acpi-test-data/pc/FACP
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/FACS b/tests/acpi-test-data/pc/FACS
deleted file mode 100644
index fc67ecc407..0000000000
--- a/tests/acpi-test-data/pc/FACS
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/HPET b/tests/acpi-test-data/pc/HPET
deleted file mode 100644
index df689b8f99..0000000000
--- a/tests/acpi-test-data/pc/HPET
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/NFIT.dimmpxm b/tests/acpi-test-data/pc/NFIT.dimmpxm
deleted file mode 100644
index 598d331b75..0000000000
--- a/tests/acpi-test-data/pc/NFIT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SLIT.cphp b/tests/acpi-test-data/pc/SLIT.cphp
deleted file mode 100644
index 74ec3b4b46..0000000000
--- a/tests/acpi-test-data/pc/SLIT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SLIT.memhp b/tests/acpi-test-data/pc/SLIT.memhp
deleted file mode 100644
index 74ec3b4b46..0000000000
--- a/tests/acpi-test-data/pc/SLIT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SRAT.cphp b/tests/acpi-test-data/pc/SRAT.cphp
deleted file mode 100644
index ff2137642f..0000000000
--- a/tests/acpi-test-data/pc/SRAT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SRAT.dimmpxm b/tests/acpi-test-data/pc/SRAT.dimmpxm
deleted file mode 100644
index f5c0267ea2..0000000000
--- a/tests/acpi-test-data/pc/SRAT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/acpi-test-data/pc/SRAT.memhp
deleted file mode 100644
index e508b4ae3c..0000000000
--- a/tests/acpi-test-data/pc/SRAT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SRAT.numamem b/tests/acpi-test-data/pc/SRAT.numamem
deleted file mode 100644
index 119922f497..0000000000
--- a/tests/acpi-test-data/pc/SRAT.numamem
+++ /dev/null
diff --git a/tests/acpi-test-data/pc/SSDT.dimmpxm b/tests/acpi-test-data/pc/SSDT.dimmpxm
deleted file mode 100644
index 8ba0e67cb7..0000000000
--- a/tests/acpi-test-data/pc/SSDT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/APIC b/tests/acpi-test-data/q35/APIC
deleted file mode 100644
index 84509e0ae4..0000000000
--- a/tests/acpi-test-data/q35/APIC
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/APIC.cphp b/tests/acpi-test-data/q35/APIC.cphp
deleted file mode 100644
index 1bf8a0a63b..0000000000
--- a/tests/acpi-test-data/q35/APIC.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/APIC.dimmpxm b/tests/acpi-test-data/q35/APIC.dimmpxm
deleted file mode 100644
index 427bb08248..0000000000
--- a/tests/acpi-test-data/q35/APIC.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
deleted file mode 100644
index 7576ffcd05..0000000000
--- a/tests/acpi-test-data/q35/DSDT
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
deleted file mode 100644
index c623cc5d72..0000000000
--- a/tests/acpi-test-data/q35/DSDT.bridge
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.cphp b/tests/acpi-test-data/q35/DSDT.cphp
deleted file mode 100644
index 7ac526e466..0000000000
--- a/tests/acpi-test-data/q35/DSDT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.dimmpxm b/tests/acpi-test-data/q35/DSDT.dimmpxm
deleted file mode 100644
index 3837792dec..0000000000
--- a/tests/acpi-test-data/q35/DSDT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt b/tests/acpi-test-data/q35/DSDT.ipmibt
deleted file mode 100644
index c7f431f058..0000000000
--- a/tests/acpi-test-data/q35/DSDT.ipmibt
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/acpi-test-data/q35/DSDT.memhp
deleted file mode 100644
index 8fba0baf79..0000000000
--- a/tests/acpi-test-data/q35/DSDT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/DSDT.numamem b/tests/acpi-test-data/q35/DSDT.numamem
deleted file mode 100644
index 6c0d4f2bcb..0000000000
--- a/tests/acpi-test-data/q35/DSDT.numamem
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/FACP b/tests/acpi-test-data/q35/FACP
deleted file mode 100644
index 72c9d97902..0000000000
--- a/tests/acpi-test-data/q35/FACP
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/FACS b/tests/acpi-test-data/q35/FACS
deleted file mode 100644
index fc67ecc407..0000000000
--- a/tests/acpi-test-data/q35/FACS
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/HPET b/tests/acpi-test-data/q35/HPET
deleted file mode 100644
index df689b8f99..0000000000
--- a/tests/acpi-test-data/q35/HPET
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/MCFG b/tests/acpi-test-data/q35/MCFG
deleted file mode 100644
index 79ceb27a03..0000000000
--- a/tests/acpi-test-data/q35/MCFG
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/NFIT.dimmpxm b/tests/acpi-test-data/q35/NFIT.dimmpxm
deleted file mode 100644
index 598d331b75..0000000000
--- a/tests/acpi-test-data/q35/NFIT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SLIT.cphp b/tests/acpi-test-data/q35/SLIT.cphp
deleted file mode 100644
index 74ec3b4b46..0000000000
--- a/tests/acpi-test-data/q35/SLIT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SLIT.memhp b/tests/acpi-test-data/q35/SLIT.memhp
deleted file mode 100644
index 74ec3b4b46..0000000000
--- a/tests/acpi-test-data/q35/SLIT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SRAT.cphp b/tests/acpi-test-data/q35/SRAT.cphp
deleted file mode 100644
index ff2137642f..0000000000
--- a/tests/acpi-test-data/q35/SRAT.cphp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SRAT.dimmpxm b/tests/acpi-test-data/q35/SRAT.dimmpxm
deleted file mode 100644
index f5c0267ea2..0000000000
--- a/tests/acpi-test-data/q35/SRAT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/acpi-test-data/q35/SRAT.memhp
deleted file mode 100644
index e508b4ae3c..0000000000
--- a/tests/acpi-test-data/q35/SRAT.memhp
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SRAT.numamem b/tests/acpi-test-data/q35/SRAT.numamem
deleted file mode 100644
index 119922f497..0000000000
--- a/tests/acpi-test-data/q35/SRAT.numamem
+++ /dev/null
diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm
deleted file mode 100644
index 2d5b721bcf..0000000000
--- a/tests/acpi-test-data/q35/SSDT.dimmpxm
+++ /dev/null
diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh
deleted file mode 100755
index 11bf743914..0000000000
--- a/tests/acpi-test-data/rebuild-expected-aml.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/bash
-
-#
-# Rebuild expected AML files for acpi unit-test
-#
-# Copyright (c) 2013 Red Hat Inc.
-#
-# Authors:
-#  Marcel Apfelbaum <marcel.a@redhat.com>
-#
-# This work is licensed under the terms of the GNU GPLv2.
-# See the COPYING.LIB file in the top-level directory.
-
-qemu=
-
-if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
-    qemu="x86_64-softmmu/qemu-system-x86_64"
-elif [ -e i386-softmmu/qemu-system-i386 ]; then
-    qemu="i386-softmmu/qemu-system-i386"
-else
-    echo "Run 'make' to build the qemu exectutable!"
-    echo "Run this script from the build directory."
-    exit 1;
-fi
-
-if [ ! -e "tests/bios-tables-test" ]; then
-    echo "Test: bios-tables-test is required! Run make check before this script."
-    echo "Run this script from the build directory."
-    exit 1;
-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/ ."