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>

diff --git a/configure b/configure
index 46ae1e8c767018d741a01b808d0a6efda587abb8..895b7483b8a54a23227f76dccf0af19bf978ec27 100755 (executable)
--- 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/acpi-test-data/pc/APIC b/tests/acpi-test-data/pc/APIC
deleted file mode 100644 (file)
index 84509e0..0000000
Binary files a/tests/acpi-test-data/pc/APIC and /dev/null differ

diff --git a/tests/acpi-test-data/pc/APIC.cphp b/tests/acpi-test-data/pc/APIC.cphp
deleted file mode 100644 (file)
index 1bf8a0a..0000000
Binary files a/tests/acpi-test-data/pc/APIC.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/APIC.dimmpxm b/tests/acpi-test-data/pc/APIC.dimmpxm
deleted file mode 100644 (file)
index 427bb08..0000000
Binary files a/tests/acpi-test-data/pc/APIC.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
deleted file mode 100644 (file)
index c6adfe3..0000000
Binary files a/tests/acpi-test-data/pc/DSDT and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge
deleted file mode 100644 (file)
index f01fa3a..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.bridge and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.cphp b/tests/acpi-test-data/pc/DSDT.cphp
deleted file mode 100644 (file)
index 3295d81..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.dimmpxm b/tests/acpi-test-data/pc/DSDT.dimmpxm
deleted file mode 100644 (file)
index f6ec911..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.ipmikcs b/tests/acpi-test-data/pc/DSDT.ipmikcs
deleted file mode 100644 (file)
index 2633a8c..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.ipmikcs and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.memhp b/tests/acpi-test-data/pc/DSDT.memhp
deleted file mode 100644 (file)
index e31ef50..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/DSDT.numamem b/tests/acpi-test-data/pc/DSDT.numamem
deleted file mode 100644 (file)
index 71a975b..0000000
Binary files a/tests/acpi-test-data/pc/DSDT.numamem and /dev/null differ

diff --git a/tests/acpi-test-data/pc/FACP b/tests/acpi-test-data/pc/FACP
deleted file mode 100644 (file)
index 261ebdc..0000000
Binary files a/tests/acpi-test-data/pc/FACP and /dev/null differ

diff --git a/tests/acpi-test-data/pc/FACS b/tests/acpi-test-data/pc/FACS
deleted file mode 100644 (file)
index fc67ecc..0000000
Binary files a/tests/acpi-test-data/pc/FACS and /dev/null differ

diff --git a/tests/acpi-test-data/pc/HPET b/tests/acpi-test-data/pc/HPET
deleted file mode 100644 (file)
index df689b8..0000000
Binary files a/tests/acpi-test-data/pc/HPET and /dev/null differ

diff --git a/tests/acpi-test-data/pc/NFIT.dimmpxm b/tests/acpi-test-data/pc/NFIT.dimmpxm
deleted file mode 100644 (file)
index 598d331..0000000
Binary files a/tests/acpi-test-data/pc/NFIT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SLIT.cphp b/tests/acpi-test-data/pc/SLIT.cphp
deleted file mode 100644 (file)
index 74ec3b4..0000000
Binary files a/tests/acpi-test-data/pc/SLIT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SLIT.memhp b/tests/acpi-test-data/pc/SLIT.memhp
deleted file mode 100644 (file)
index 74ec3b4..0000000
Binary files a/tests/acpi-test-data/pc/SLIT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SRAT.cphp b/tests/acpi-test-data/pc/SRAT.cphp
deleted file mode 100644 (file)
index ff21376..0000000
Binary files a/tests/acpi-test-data/pc/SRAT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SRAT.dimmpxm b/tests/acpi-test-data/pc/SRAT.dimmpxm
deleted file mode 100644 (file)
index f5c0267..0000000
Binary files a/tests/acpi-test-data/pc/SRAT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/acpi-test-data/pc/SRAT.memhp
deleted file mode 100644 (file)
index e508b4a..0000000
Binary files a/tests/acpi-test-data/pc/SRAT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SRAT.numamem b/tests/acpi-test-data/pc/SRAT.numamem
deleted file mode 100644 (file)
index 119922f..0000000
Binary files a/tests/acpi-test-data/pc/SRAT.numamem and /dev/null differ

diff --git a/tests/acpi-test-data/pc/SSDT.dimmpxm b/tests/acpi-test-data/pc/SSDT.dimmpxm
deleted file mode 100644 (file)
index 8ba0e67..0000000
Binary files a/tests/acpi-test-data/pc/SSDT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/q35/APIC b/tests/acpi-test-data/q35/APIC
deleted file mode 100644 (file)
index 84509e0..0000000
Binary files a/tests/acpi-test-data/q35/APIC and /dev/null differ

diff --git a/tests/acpi-test-data/q35/APIC.cphp b/tests/acpi-test-data/q35/APIC.cphp
deleted file mode 100644 (file)
index 1bf8a0a..0000000
Binary files a/tests/acpi-test-data/q35/APIC.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/APIC.dimmpxm b/tests/acpi-test-data/q35/APIC.dimmpxm
deleted file mode 100644 (file)
index 427bb08..0000000
Binary files a/tests/acpi-test-data/q35/APIC.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
deleted file mode 100644 (file)
index 7576ffc..0000000
Binary files a/tests/acpi-test-data/q35/DSDT and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
deleted file mode 100644 (file)
index c623cc5..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.bridge and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.cphp b/tests/acpi-test-data/q35/DSDT.cphp
deleted file mode 100644 (file)
index 7ac526e..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.dimmpxm b/tests/acpi-test-data/q35/DSDT.dimmpxm
deleted file mode 100644 (file)
index 3837792..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt b/tests/acpi-test-data/q35/DSDT.ipmibt
deleted file mode 100644 (file)
index c7f431f..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.ipmibt and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.memhp b/tests/acpi-test-data/q35/DSDT.memhp
deleted file mode 100644 (file)
index 8fba0ba..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/DSDT.numamem b/tests/acpi-test-data/q35/DSDT.numamem
deleted file mode 100644 (file)
index 6c0d4f2..0000000
Binary files a/tests/acpi-test-data/q35/DSDT.numamem and /dev/null differ

diff --git a/tests/acpi-test-data/q35/FACP b/tests/acpi-test-data/q35/FACP
deleted file mode 100644 (file)
index 72c9d97..0000000
Binary files a/tests/acpi-test-data/q35/FACP and /dev/null differ

diff --git a/tests/acpi-test-data/q35/FACS b/tests/acpi-test-data/q35/FACS
deleted file mode 100644 (file)
index fc67ecc..0000000
Binary files a/tests/acpi-test-data/q35/FACS and /dev/null differ

diff --git a/tests/acpi-test-data/q35/HPET b/tests/acpi-test-data/q35/HPET
deleted file mode 100644 (file)
index df689b8..0000000
Binary files a/tests/acpi-test-data/q35/HPET and /dev/null differ

diff --git a/tests/acpi-test-data/q35/MCFG b/tests/acpi-test-data/q35/MCFG
deleted file mode 100644 (file)
index 79ceb27..0000000
Binary files a/tests/acpi-test-data/q35/MCFG and /dev/null differ

diff --git a/tests/acpi-test-data/q35/NFIT.dimmpxm b/tests/acpi-test-data/q35/NFIT.dimmpxm
deleted file mode 100644 (file)
index 598d331..0000000
Binary files a/tests/acpi-test-data/q35/NFIT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SLIT.cphp b/tests/acpi-test-data/q35/SLIT.cphp
deleted file mode 100644 (file)
index 74ec3b4..0000000
Binary files a/tests/acpi-test-data/q35/SLIT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SLIT.memhp b/tests/acpi-test-data/q35/SLIT.memhp
deleted file mode 100644 (file)
index 74ec3b4..0000000
Binary files a/tests/acpi-test-data/q35/SLIT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SRAT.cphp b/tests/acpi-test-data/q35/SRAT.cphp
deleted file mode 100644 (file)
index ff21376..0000000
Binary files a/tests/acpi-test-data/q35/SRAT.cphp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SRAT.dimmpxm b/tests/acpi-test-data/q35/SRAT.dimmpxm
deleted file mode 100644 (file)
index f5c0267..0000000
Binary files a/tests/acpi-test-data/q35/SRAT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/acpi-test-data/q35/SRAT.memhp
deleted file mode 100644 (file)
index e508b4a..0000000
Binary files a/tests/acpi-test-data/q35/SRAT.memhp and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SRAT.numamem b/tests/acpi-test-data/q35/SRAT.numamem
deleted file mode 100644 (file)
index 119922f..0000000
Binary files a/tests/acpi-test-data/q35/SRAT.numamem and /dev/null differ

diff --git a/tests/acpi-test-data/q35/SSDT.dimmpxm b/tests/acpi-test-data/q35/SSDT.dimmpxm
deleted file mode 100644 (file)
index 2d5b721..0000000
Binary files a/tests/acpi-test-data/q35/SSDT.dimmpxm and /dev/null differ

diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh
deleted file mode 100755 (executable)
index 11bf743..0000000
--- 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/ ."

diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 02e77ec811b7028338de2f22d18e1ff9db0a5939..b14c8eaa17172e1639cfd5d87cc8da3960e54e37 100644 (file)
--- 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/data/acpi/pc/APIC b/tests/data/acpi/pc/APIC
new file mode 100644 (file)
index 0000000..84509e0
Binary files /dev/null and b/tests/data/acpi/pc/APIC differ

diff --git a/tests/data/acpi/pc/APIC.cphp b/tests/data/acpi/pc/APIC.cphp
new file mode 100644 (file)
index 0000000..1bf8a0a
Binary files /dev/null and b/tests/data/acpi/pc/APIC.cphp differ

diff --git a/tests/data/acpi/pc/APIC.dimmpxm b/tests/data/acpi/pc/APIC.dimmpxm
new file mode 100644 (file)
index 0000000..427bb08
Binary files /dev/null and b/tests/data/acpi/pc/APIC.dimmpxm differ

diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT
new file mode 100644 (file)
index 0000000..c6adfe3
Binary files /dev/null and b/tests/data/acpi/pc/DSDT differ

diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge
new file mode 100644 (file)
index 0000000..f01fa3a
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.bridge differ

diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp
new file mode 100644 (file)
index 0000000..3295d81
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.cphp differ

diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm
new file mode 100644 (file)
index 0000000..f6ec911
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.dimmpxm differ

diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmikcs
new file mode 100644 (file)
index 0000000..2633a8c
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.ipmikcs differ

diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp
new file mode 100644 (file)
index 0000000..e31ef50
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.memhp differ

diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem
new file mode 100644 (file)
index 0000000..71a975b
Binary files /dev/null and b/tests/data/acpi/pc/DSDT.numamem differ

diff --git a/tests/data/acpi/pc/FACP b/tests/data/acpi/pc/FACP
new file mode 100644 (file)
index 0000000..261ebdc
Binary files /dev/null and b/tests/data/acpi/pc/FACP differ

diff --git a/tests/data/acpi/pc/FACS b/tests/data/acpi/pc/FACS
new file mode 100644 (file)
index 0000000..fc67ecc
Binary files /dev/null and b/tests/data/acpi/pc/FACS differ

diff --git a/tests/data/acpi/pc/HPET b/tests/data/acpi/pc/HPET
new file mode 100644 (file)
index 0000000..df689b8
Binary files /dev/null and b/tests/data/acpi/pc/HPET differ

diff --git a/tests/data/acpi/pc/NFIT.dimmpxm b/tests/data/acpi/pc/NFIT.dimmpxm
new file mode 100644 (file)
index 0000000..598d331
Binary files /dev/null and b/tests/data/acpi/pc/NFIT.dimmpxm differ

diff --git a/tests/data/acpi/pc/SLIT.cphp b/tests/data/acpi/pc/SLIT.cphp
new file mode 100644 (file)
index 0000000..74ec3b4
Binary files /dev/null and b/tests/data/acpi/pc/SLIT.cphp differ

diff --git a/tests/data/acpi/pc/SLIT.memhp b/tests/data/acpi/pc/SLIT.memhp
new file mode 100644 (file)
index 0000000..74ec3b4
Binary files /dev/null and b/tests/data/acpi/pc/SLIT.memhp differ

diff --git a/tests/data/acpi/pc/SRAT.cphp b/tests/data/acpi/pc/SRAT.cphp
new file mode 100644 (file)
index 0000000..ff21376
Binary files /dev/null and b/tests/data/acpi/pc/SRAT.cphp differ

diff --git a/tests/data/acpi/pc/SRAT.dimmpxm b/tests/data/acpi/pc/SRAT.dimmpxm
new file mode 100644 (file)
index 0000000..f5c0267
Binary files /dev/null and b/tests/data/acpi/pc/SRAT.dimmpxm differ

diff --git a/tests/data/acpi/pc/SRAT.memhp b/tests/data/acpi/pc/SRAT.memhp
new file mode 100644 (file)
index 0000000..e508b4a
Binary files /dev/null and b/tests/data/acpi/pc/SRAT.memhp differ

diff --git a/tests/data/acpi/pc/SRAT.numamem b/tests/data/acpi/pc/SRAT.numamem
new file mode 100644 (file)
index 0000000..119922f
Binary files /dev/null and b/tests/data/acpi/pc/SRAT.numamem differ

diff --git a/tests/data/acpi/pc/SSDT.dimmpxm b/tests/data/acpi/pc/SSDT.dimmpxm
new file mode 100644 (file)
index 0000000..8ba0e67
Binary files /dev/null and b/tests/data/acpi/pc/SSDT.dimmpxm differ

diff --git a/tests/data/acpi/q35/APIC b/tests/data/acpi/q35/APIC
new file mode 100644 (file)
index 0000000..84509e0
Binary files /dev/null and b/tests/data/acpi/q35/APIC differ

diff --git a/tests/data/acpi/q35/APIC.cphp b/tests/data/acpi/q35/APIC.cphp
new file mode 100644 (file)
index 0000000..1bf8a0a
Binary files /dev/null and b/tests/data/acpi/q35/APIC.cphp differ

diff --git a/tests/data/acpi/q35/APIC.dimmpxm b/tests/data/acpi/q35/APIC.dimmpxm
new file mode 100644 (file)
index 0000000..427bb08
Binary files /dev/null and b/tests/data/acpi/q35/APIC.dimmpxm differ

diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT
new file mode 100644 (file)
index 0000000..7576ffc
Binary files /dev/null and b/tests/data/acpi/q35/DSDT differ

diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bridge
new file mode 100644 (file)
index 0000000..c623cc5
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.bridge differ

diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp
new file mode 100644 (file)
index 0000000..7ac526e
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.cphp differ

diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.dimmpxm
new file mode 100644 (file)
index 0000000..3837792
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.dimmpxm differ

diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipmibt
new file mode 100644 (file)
index 0000000..c7f431f
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.ipmibt differ

diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp
new file mode 100644 (file)
index 0000000..8fba0ba
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.memhp differ

diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.numamem
new file mode 100644 (file)
index 0000000..6c0d4f2
Binary files /dev/null and b/tests/data/acpi/q35/DSDT.numamem differ

diff --git a/tests/data/acpi/q35/FACP b/tests/data/acpi/q35/FACP
new file mode 100644 (file)
index 0000000..72c9d97
Binary files /dev/null and b/tests/data/acpi/q35/FACP differ

diff --git a/tests/data/acpi/q35/FACS b/tests/data/acpi/q35/FACS
new file mode 100644 (file)
index 0000000..fc67ecc
Binary files /dev/null and b/tests/data/acpi/q35/FACS differ

diff --git a/tests/data/acpi/q35/HPET b/tests/data/acpi/q35/HPET
new file mode 100644 (file)
index 0000000..df689b8
Binary files /dev/null and b/tests/data/acpi/q35/HPET differ

diff --git a/tests/data/acpi/q35/MCFG b/tests/data/acpi/q35/MCFG
new file mode 100644 (file)
index 0000000..79ceb27
Binary files /dev/null and b/tests/data/acpi/q35/MCFG differ

diff --git a/tests/data/acpi/q35/NFIT.dimmpxm b/tests/data/acpi/q35/NFIT.dimmpxm
new file mode 100644 (file)
index 0000000..598d331
Binary files /dev/null and b/tests/data/acpi/q35/NFIT.dimmpxm differ

diff --git a/tests/data/acpi/q35/SLIT.cphp b/tests/data/acpi/q35/SLIT.cphp
new file mode 100644 (file)
index 0000000..74ec3b4
Binary files /dev/null and b/tests/data/acpi/q35/SLIT.cphp differ

diff --git a/tests/data/acpi/q35/SLIT.memhp b/tests/data/acpi/q35/SLIT.memhp
new file mode 100644 (file)
index 0000000..74ec3b4
Binary files /dev/null and b/tests/data/acpi/q35/SLIT.memhp differ

diff --git a/tests/data/acpi/q35/SRAT.cphp b/tests/data/acpi/q35/SRAT.cphp
new file mode 100644 (file)
index 0000000..ff21376
Binary files /dev/null and b/tests/data/acpi/q35/SRAT.cphp differ

diff --git a/tests/data/acpi/q35/SRAT.dimmpxm b/tests/data/acpi/q35/SRAT.dimmpxm
new file mode 100644 (file)
index 0000000..f5c0267
Binary files /dev/null and b/tests/data/acpi/q35/SRAT.dimmpxm differ

diff --git a/tests/data/acpi/q35/SRAT.memhp b/tests/data/acpi/q35/SRAT.memhp
new file mode 100644 (file)
index 0000000..e508b4a
Binary files /dev/null and b/tests/data/acpi/q35/SRAT.memhp differ

diff --git a/tests/data/acpi/q35/SRAT.numamem b/tests/data/acpi/q35/SRAT.numamem
new file mode 100644 (file)
index 0000000..119922f
Binary files /dev/null and b/tests/data/acpi/q35/SRAT.numamem differ

diff --git a/tests/data/acpi/q35/SSDT.dimmpxm b/tests/data/acpi/q35/SSDT.dimmpxm
new file mode 100644 (file)
index 0000000..2d5b721
Binary files /dev/null and b/tests/data/acpi/q35/SSDT.dimmpxm differ

diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh
new file mode 100755 (executable)
index 0000000..bf9ba24
--- /dev/null
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -0,0 +1,34 @@
+#! /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."