Re: [Qemu-devel] [PATCH 14/14] tests: acpi: refactor rebuild-expected-aml.sh to dump ACPI tables for a specified list of targets

[Igor Mammedov <imammedo@redhat.com>]

On Wed, 16 Jan 2019 18:08:17 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> On 1/15/19 4:41 PM, Igor Mammedov wrote:
> > Make initial list contain aarch64 and x86_64 targets.  
> 
> Maybe worth adding a line "remove i386"?
I've dropped i386 as it's redundant, since x86_64 target re-builds the same tables.
And maintainer is likely to build all targets when preparing update/pull req.

> > Signed-off-by: Igor Mammedov <imammedo@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 bf9ba24..6287aa6 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 following the qemu exectutables: $qemu_bins"  
> 
> "to build the following QEMU executables: ..."
> 
> > +        echo "Run this script from the build directory."  
> 
> Maybe "Also, run ..."
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks,
I'll add the corrections on respin.

> 
> > +        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."
> >