| Message ID | 1556170489-131927-13-git-send-email-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: acpi: add UEFI (ARM) testing support | expand |
On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote: >Make initial list contain aarch64 and x86_64 targets. so i386 is taken out? > >Signed-off-by: Igor Mammedov <imammedo@redhat.com> >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> >--- >v2: > * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>) >--- > 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..52793f3 100755 >--- a/tests/data/acpi/rebuild-expected-aml.sh >+++ b/tests/data/acpi/rebuild-expected-aml.sh >@@ -7,21 +7,12 @@ > # > # Authors: > # Marcel Apfelbaum <marcel.a@redhat.com> >+# Igor Mammedov <imammedo@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 >+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 exectutables: $qemu_bins" s/exectutables/executables >+ 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 >+ The original behavior is either one executable exist will pass. But now, either of one doesn't exist will fail. Is this what we expect? > > echo "The files were rebuilt and can be added to git." >-- >2.7.4
On Thu, 25 Apr 2019 16:20:50 +0800 Wei Yang <richardw.yang@linux.intel.com> wrote: > On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote: > >Make initial list contain aarch64 and x86_64 targets. > > so i386 is taken out? > > > > >Signed-off-by: Igor Mammedov <imammedo@redhat.com> > >Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > >--- > >v2: > > * fix up error message (Philippe Mathieu-Daudé <philmd@redhat.com>) > >--- > > 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..52793f3 100755 > >--- a/tests/data/acpi/rebuild-expected-aml.sh > >+++ b/tests/data/acpi/rebuild-expected-aml.sh > >@@ -7,21 +7,12 @@ > > # > > # Authors: > > # Marcel Apfelbaum <marcel.a@redhat.com> > >+# Igor Mammedov <imammedo@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 > >+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 exectutables: $qemu_bins" > > s/exectutables/executables fixed > >+ 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 > >+ > > The original behavior is either one executable exist will pass. > > But now, either of one doesn't exist will fail. Is this what we expect? It's mainly maintainers tool to update reference blobs. And I intentionally made it fail to force maintainer/developer building all targets that depend on ACPI to make sure that mistakes won't silently creep in due to non build target. > > echo "The files were rebuilt and can be added to git." > >-- > >2.7.4 >
On Thu, 25 Apr 2019 13:32:50 +0200 Igor Mammedov <imammedo@redhat.com> wrote: > On Thu, 25 Apr 2019 16:20:50 +0800 > Wei Yang <richardw.yang@linux.intel.com> wrote: > > > On Thu, Apr 25, 2019 at 07:34:48AM +0200, Igor Mammedov wrote: > > >Make initial list contain aarch64 and x86_64 targets. > > > > so i386 is taken out? we use the same blobs for both i386 and x86_64 targets so it was sort of duplication. But someone who intends to update reference blobs, surely can build x86_64 and aarch64 targets to achieve their goal.
diff --git a/tests/data/acpi/rebuild-expected-aml.sh b/tests/data/acpi/rebuild-expected-aml.sh index abdff70..52793f3 100755 --- a/tests/data/acpi/rebuild-expected-aml.sh +++ b/tests/data/acpi/rebuild-expected-aml.sh @@ -7,21 +7,12 @@ # # Authors: # Marcel Apfelbaum <marcel.a@redhat.com> +# Igor Mammedov <imammedo@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 +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 exectutables: $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."