From 438c78dab75e3b9d1bc8da1d5401da77c84e27b7 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 2 Nov 2018 11:52:36 +0000 Subject: 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 Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/pc/APIC | Bin 0 -> 120 bytes tests/data/acpi/pc/APIC.cphp | Bin 0 -> 160 bytes tests/data/acpi/pc/APIC.dimmpxm | Bin 0 -> 144 bytes tests/data/acpi/pc/DSDT | Bin 0 -> 5131 bytes tests/data/acpi/pc/DSDT.bridge | Bin 0 -> 6990 bytes tests/data/acpi/pc/DSDT.cphp | Bin 0 -> 5594 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 0 -> 6790 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 0 -> 5203 bytes tests/data/acpi/pc/DSDT.memhp | Bin 0 -> 6496 bytes tests/data/acpi/pc/DSDT.numamem | Bin 0 -> 5137 bytes tests/data/acpi/pc/FACP | Bin 0 -> 116 bytes tests/data/acpi/pc/FACS | Bin 0 -> 64 bytes tests/data/acpi/pc/HPET | Bin 0 -> 56 bytes tests/data/acpi/pc/NFIT.dimmpxm | Bin 0 -> 240 bytes tests/data/acpi/pc/SLIT.cphp | Bin 0 -> 48 bytes tests/data/acpi/pc/SLIT.memhp | Bin 0 -> 48 bytes tests/data/acpi/pc/SRAT.cphp | Bin 0 -> 304 bytes tests/data/acpi/pc/SRAT.dimmpxm | Bin 0 -> 392 bytes tests/data/acpi/pc/SRAT.memhp | Bin 0 -> 264 bytes tests/data/acpi/pc/SRAT.numamem | Bin 0 -> 224 bytes tests/data/acpi/pc/SSDT.dimmpxm | Bin 0 -> 685 bytes tests/data/acpi/q35/APIC | Bin 0 -> 120 bytes tests/data/acpi/q35/APIC.cphp | Bin 0 -> 160 bytes tests/data/acpi/q35/APIC.dimmpxm | Bin 0 -> 144 bytes tests/data/acpi/q35/DSDT | Bin 0 -> 7815 bytes tests/data/acpi/q35/DSDT.bridge | Bin 0 -> 7832 bytes tests/data/acpi/q35/DSDT.cphp | Bin 0 -> 8278 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 0 -> 9474 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 0 -> 7890 bytes tests/data/acpi/q35/DSDT.memhp | Bin 0 -> 9180 bytes tests/data/acpi/q35/DSDT.numamem | Bin 0 -> 7821 bytes tests/data/acpi/q35/FACP | Bin 0 -> 244 bytes tests/data/acpi/q35/FACS | Bin 0 -> 64 bytes tests/data/acpi/q35/HPET | Bin 0 -> 56 bytes tests/data/acpi/q35/MCFG | Bin 0 -> 60 bytes tests/data/acpi/q35/NFIT.dimmpxm | Bin 0 -> 240 bytes tests/data/acpi/q35/SLIT.cphp | Bin 0 -> 48 bytes tests/data/acpi/q35/SLIT.memhp | Bin 0 -> 48 bytes tests/data/acpi/q35/SRAT.cphp | Bin 0 -> 304 bytes tests/data/acpi/q35/SRAT.dimmpxm | Bin 0 -> 392 bytes tests/data/acpi/q35/SRAT.memhp | Bin 0 -> 264 bytes tests/data/acpi/q35/SRAT.numamem | Bin 0 -> 224 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 0 -> 685 bytes tests/data/acpi/rebuild-expected-aml.sh | 34 ++++++++++++++++++++++++++++++++ 44 files changed, 34 insertions(+) create mode 100644 tests/data/acpi/pc/APIC create mode 100644 tests/data/acpi/pc/APIC.cphp create mode 100644 tests/data/acpi/pc/APIC.dimmpxm create mode 100644 tests/data/acpi/pc/DSDT create mode 100644 tests/data/acpi/pc/DSDT.bridge create mode 100644 tests/data/acpi/pc/DSDT.cphp create mode 100644 tests/data/acpi/pc/DSDT.dimmpxm create mode 100644 tests/data/acpi/pc/DSDT.ipmikcs create mode 100644 tests/data/acpi/pc/DSDT.memhp create mode 100644 tests/data/acpi/pc/DSDT.numamem create mode 100644 tests/data/acpi/pc/FACP create mode 100644 tests/data/acpi/pc/FACS create mode 100644 tests/data/acpi/pc/HPET create mode 100644 tests/data/acpi/pc/NFIT.dimmpxm create mode 100644 tests/data/acpi/pc/SLIT.cphp create mode 100644 tests/data/acpi/pc/SLIT.memhp create mode 100644 tests/data/acpi/pc/SRAT.cphp create mode 100644 tests/data/acpi/pc/SRAT.dimmpxm create mode 100644 tests/data/acpi/pc/SRAT.memhp create mode 100644 tests/data/acpi/pc/SRAT.numamem create mode 100644 tests/data/acpi/pc/SSDT.dimmpxm create mode 100644 tests/data/acpi/q35/APIC create mode 100644 tests/data/acpi/q35/APIC.cphp create mode 100644 tests/data/acpi/q35/APIC.dimmpxm create mode 100644 tests/data/acpi/q35/DSDT create mode 100644 tests/data/acpi/q35/DSDT.bridge create mode 100644 tests/data/acpi/q35/DSDT.cphp create mode 100644 tests/data/acpi/q35/DSDT.dimmpxm create mode 100644 tests/data/acpi/q35/DSDT.ipmibt create mode 100644 tests/data/acpi/q35/DSDT.memhp create mode 100644 tests/data/acpi/q35/DSDT.numamem create mode 100644 tests/data/acpi/q35/FACP create mode 100644 tests/data/acpi/q35/FACS create mode 100644 tests/data/acpi/q35/HPET create mode 100644 tests/data/acpi/q35/MCFG create mode 100644 tests/data/acpi/q35/NFIT.dimmpxm create mode 100644 tests/data/acpi/q35/SLIT.cphp create mode 100644 tests/data/acpi/q35/SLIT.memhp create mode 100644 tests/data/acpi/q35/SRAT.cphp create mode 100644 tests/data/acpi/q35/SRAT.dimmpxm create mode 100644 tests/data/acpi/q35/SRAT.memhp create mode 100644 tests/data/acpi/q35/SRAT.numamem create mode 100644 tests/data/acpi/q35/SSDT.dimmpxm create mode 100755 tests/data/acpi/rebuild-expected-aml.sh (limited to 'tests/data') diff --git a/tests/data/acpi/pc/APIC b/tests/data/acpi/pc/APIC new file mode 100644 index 0000000000..84509e0ae4 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 index 0000000000..1bf8a0a63b 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 index 0000000000..427bb08248 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 index 0000000000..c6adfe32d5 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 index 0000000000..f01fa3ad4e 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 index 0000000000..3295d81c7f 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 index 0000000000..f6ec911b11 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 index 0000000000..2633a8cecf 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 index 0000000000..e31ef50296 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 index 0000000000..71a975b3e2 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 index 0000000000..261ebdc5d1 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 index 0000000000..fc67ecc407 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 index 0000000000..df689b8f99 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 index 0000000000..598d331b75 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 index 0000000000..74ec3b4b46 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 index 0000000000..74ec3b4b46 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 index 0000000000..ff2137642f 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 index 0000000000..f5c0267ea2 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 index 0000000000..e508b4ae3c 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 index 0000000000..119922f497 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 index 0000000000..8ba0e67cb7 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 index 0000000000..84509e0ae4 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 index 0000000000..1bf8a0a63b 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 index 0000000000..427bb08248 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 index 0000000000..7576ffcd05 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 index 0000000000..c623cc5d72 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 index 0000000000..7ac526e466 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 index 0000000000..3837792dec 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 index 0000000000..c7f431f058 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 index 0000000000..8fba0baf79 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 index 0000000000..6c0d4f2bcb 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 index 0000000000..72c9d97902 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 index 0000000000..fc67ecc407 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 index 0000000000..df689b8f99 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 index 0000000000..79ceb27a03 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 index 0000000000..598d331b75 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 index 0000000000..74ec3b4b46 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 index 0000000000..74ec3b4b46 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 index 0000000000..ff2137642f 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 index 0000000000..f5c0267ea2 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 index 0000000000..e508b4ae3c 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 index 0000000000..119922f497 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 index 0000000000..2d5b721bcf 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 index 0000000000..bf9ba242ad --- /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 +# +# 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." -- cgit v1.2.3-55-g7522 From 4b2ff65a1f33b6130bfd92a8aaf6289909af9d35 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 2 Nov 2018 11:52:37 +0000 Subject: tests: Move tests/hex-loader-check-data/ to tests/data/hex-loader/ Currently tests/hex-loader-check-data contains data files used by the hexloader-test, and configure individually symlinks those data files into the build directory using a wildcard. Using a wildcard like this is a bad idea, because if a new data file is added, nothing causes configure to be rerun, and so no symlink is added for the new file. This can cause tests to spuriously fail when they can't find their data. Instead, it's better to symlink an entire directory of data files. We already have such a directory: tests/data. Move the data files from tests/hex-loader-check-data/ to tests/data/hex-loader/, and remove the unnecessary symlinking. Signed-off-by: Peter Maydell Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- MAINTAINERS | 2 +- configure | 4 ---- tests/data/hex-loader/test.hex | 18 ++++++++++++++++++ tests/hex-loader-check-data/test.hex | 18 ------------------ tests/hexloader-test.c | 2 +- 5 files changed, 20 insertions(+), 24 deletions(-) create mode 100644 tests/data/hex-loader/test.hex delete mode 100644 tests/hex-loader-check-data/test.hex (limited to 'tests/data') 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/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/data/hex-loader/test.hex b/tests/data/hex-loader/test.hex new file mode 100644 index 0000000000..008a90bd4d --- /dev/null +++ b/tests/data/hex-loader/test.hex @@ -0,0 +1,18 @@ +:020000040001F9 +:10000000000102030405060708090a0b0c0d0e0f78 +:10001000101112131415161718191a1b1c1d1e1f68 +:10002000202122232425262728292a2b2c2d2e2f58 +:10003000303132333435363738393a3b3c3d3e3f48 +:10004000404142434445464748494a4b4c4d4e4f38 +:10005000505152535455565758595a5b5c5d5e5f28 +:10006000606162636465666768696a6b6c6d6e6f18 +:10007000707172737475767778797a7b7c7d7e7f08 +:10008000808182838485868788898a8b8c8d8e8ff8 +:10009000909192939495969798999a9b9c9d9e9fe8 +:1000a000a0a1a2a3a4a5a6a7a8a9aaabacadaeafd8 +:1000b000b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc8 +:1000c000c0c1c2c3c4c5c6c7c8c9cacbcccdcecfb8 +:1000d000d0d1d2d3d4d5d6d7d8d9dadbdcdddedfa8 +:1000e000e0e1e2e3e4e5e6e7e8e9eaebecedeeef98 +:1000f000f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff88 +:00000001FF diff --git a/tests/hex-loader-check-data/test.hex b/tests/hex-loader-check-data/test.hex deleted file mode 100644 index 008a90bd4d..0000000000 --- a/tests/hex-loader-check-data/test.hex +++ /dev/null @@ -1,18 +0,0 @@ -:020000040001F9 -:10000000000102030405060708090a0b0c0d0e0f78 -:10001000101112131415161718191a1b1c1d1e1f68 -:10002000202122232425262728292a2b2c2d2e2f58 -:10003000303132333435363738393a3b3c3d3e3f48 -:10004000404142434445464748494a4b4c4d4e4f38 -:10005000505152535455565758595a5b5c5d5e5f28 -:10006000606162636465666768696a6b6c6d6e6f18 -:10007000707172737475767778797a7b7c7d7e7f08 -:10008000808182838485868788898a8b8c8d8e8ff8 -:10009000909192939495969798999a9b9c9d9e9fe8 -:1000a000a0a1a2a3a4a5a6a7a8a9aaabacadaeafd8 -:1000b000b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc8 -:1000c000c0c1c2c3c4c5c6c7c8c9cacbcccdcecfb8 -:1000d000d0d1d2d3d4d5d6d7d8d9dadbdcdddedfa8 -:1000e000e0e1e2e3e4e5e6e7e8e9eaebecedeeef98 -:1000f000f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff88 -:00000001FF 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); -- cgit v1.2.3-55-g7522 From f5f4002ddc0c0159735fc1a2dc44c97493fdff35 Mon Sep 17 00:00:00 2001 From: Michael S. Tsirkin Date: Thu, 25 Oct 2018 21:55:32 -0400 Subject: bios-tables-test: prepare expected files for mmio64 test will be added by follow-up patch. Signed-off-by: Michael S. Tsirkin --- tests/data/acpi/q35/DSDT.mmio64 | Bin 0 -> 8947 bytes tests/data/acpi/q35/SRAT.mmio64 | Bin 0 -> 224 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/q35/DSDT.mmio64 create mode 100644 tests/data/acpi/q35/SRAT.mmio64 (limited to 'tests/data') diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmio64 new file mode 100644 index 0000000000..a058ff2ee3 Binary files /dev/null and b/tests/data/acpi/q35/DSDT.mmio64 differ diff --git a/tests/data/acpi/q35/SRAT.mmio64 b/tests/data/acpi/q35/SRAT.mmio64 new file mode 100644 index 0000000000..ac35f3dac4 Binary files /dev/null and b/tests/data/acpi/q35/SRAT.mmio64 differ -- cgit v1.2.3-55-g7522