[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 14/15] tests: acpi: refactor rebuild-expected-aml
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v4 14/15] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets |
Date: |
Thu, 2 May 2019 16:52:02 +0200 |
Make initial list contain aarch64 and x86_64 targets.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
v4:
* fix typo (Wei Yang <address@hidden>)
v2:
* fix up error message (Philippe Mathieu-Daudé <address@hidden>)
---
tests/data/acpi/rebuild-expected-aml.sh | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/tests/data/acpi/rebuild-expected-aml.sh
b/tests/data/acpi/rebuild-expected-aml.sh
index abdff70..07f7e3f 100755
--- a/tests/data/acpi/rebuild-expected-aml.sh
+++ b/tests/data/acpi/rebuild-expected-aml.sh
@@ -7,21 +7,12 @@
#
# Authors:
# Marcel Apfelbaum <address@hidden>
+# Igor Mammedov <address@hidden>
#
# 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
+qemu_bins="aarch64-softmmu/qemu-system-aarch64
x86_64-softmmu/qemu-system-x86_64"
if [ ! -e "tests/bios-tables-test" ]; then
echo "Test: bios-tables-test is required! Run make check before this
script."
@@ -29,6 +20,14 @@ if [ ! -e "tests/bios-tables-test" ]; then
exit 1;
fi
-TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+for qemu in $qemu_bins; do
+ if [ ! -e $qemu ]; then
+ echo "Run 'make' to build the following QEMU executables: $qemu_bins"
+ echo "Also, run this script from the build directory."
+ exit 1;
+ fi
+ TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/bios-tables-test
+done
+
echo "The files were rebuilt and can be added to git."
--
2.7.4
- Re: [Qemu-devel] [PATCH v4 07/15] tests: acpi: move boot_sector_init() into x86 tests branch, (continued)
- [Qemu-devel] [PATCH v4 08/15] tests: acpi: add acpi_find_rsdp_address_uefi() helper, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 10/15] tests: acpi: ignore SMBIOS tests when UEFI firmware is used, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 09/15] tests: acpi: add a way to start tests with UEFI firmware, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 11/15] tests: acpi: allow to override default accelerator, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 12/15] tests: add expected ACPI tables for arm/virt board, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 13/15] tests: acpi: add simple arm/virt testcase, Igor Mammedov, 2019/05/02
- [Qemu-devel] [PATCH v4 14/15] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets,
Igor Mammedov <=
- [Qemu-devel] [PATCH v4 15/15] tests: acpi: print error unable to dump ACPI table during rebuild, Igor Mammedov, 2019/05/02
- Re: [Qemu-devel] [PATCH v4 00/15] tests: acpi: add UEFI (ARM) testing support, Wei Xu, 2019/05/02