[Qemu-devel] [PATCH] tests: fix acpi tables regeneration script

[Qemu-devel] [PATCH] tests: fix acpi tables regeneration script

[Marcel Apfelbaum]

Commit: 501f28ca9db08e84819b26314525b6369e7704dd
    tests: rename acpi-test to bios-tables-test

modified acpi-test file from acpi-test.c to bios-tables-test.c.
However, the tables regeneration script was not modified
accordingly.

Fixed the test name also in rebuild-expected-aml.sh script.

Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
---
 tests/acpi-test-data/rebuild-expected-aml.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh
index ab98498..e7ce2b3 100755
--- a/tests/acpi-test-data/rebuild-expected-aml.sh
+++ b/tests/acpi-test-data/rebuild-expected-aml.sh
@@ -12,6 +12,7 @@
 # See the COPYING.LIB file in the top-level directory.
 
 qemu=
+acpi_test_path="tests/bios-tables-test"
 
 if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
     qemu="x86_64-softmmu/qemu-system-x86_64"
@@ -23,13 +24,13 @@ else
     exit 1;
 fi
 
-if [ ! -e "tests/acpi-test" ]; then
-    echo "Test: acpi-test is required! Run make check before this script."
+if [ ! -e $acpi_test_path ]; then
+    echo "Test: $acpi_test_path 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/acpi-test
+TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu $acpi_test_path
 
 echo "The files were rebuilt and can be added to git."
 echo "However, if new files were created, please copy them manually" \
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] tests: fix acpi tables regeneration script

[Marcel Apfelbaum]

On Sun, 2014-10-19 at 16:12 +0300, Marcel Apfelbaum wrote:
> Commit: 501f28ca9db08e84819b26314525b6369e7704dd
>     tests: rename acpi-test to bios-tables-test
> 
> modified acpi-test file from acpi-test.c to bios-tables-test.c.
> However, the tables regeneration script was not modified
> accordingly.
> 
> Fixed the test name also in rebuild-expected-aml.sh script.

Mini PING

Thanks,
Marcel

> 
> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> ---
>  tests/acpi-test-data/rebuild-expected-aml.sh | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh
> index ab98498..e7ce2b3 100755
> --- a/tests/acpi-test-data/rebuild-expected-aml.sh
> +++ b/tests/acpi-test-data/rebuild-expected-aml.sh
> @@ -12,6 +12,7 @@
>  # See the COPYING.LIB file in the top-level directory.
>  
>  qemu=
> +acpi_test_path="tests/bios-tables-test"
>  
>  if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
>      qemu="x86_64-softmmu/qemu-system-x86_64"
> @@ -23,13 +24,13 @@ else
>      exit 1;
>  fi
>  
> -if [ ! -e "tests/acpi-test" ]; then
> -    echo "Test: acpi-test is required! Run make check before this script."
> +if [ ! -e $acpi_test_path ]; then
> +    echo "Test: $acpi_test_path 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/acpi-test
> +TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu $acpi_test_path
>  
>  echo "The files were rebuilt and can be added to git."
>  echo "However, if new files were created, please copy them manually" \

Re: [Qemu-devel] [PATCH] tests: fix acpi tables regeneration script

[Michael S. Tsirkin]

On Wed, Oct 22, 2014 at 10:42:26AM +0300, Marcel Apfelbaum wrote:
> On Sun, 2014-10-19 at 16:12 +0300, Marcel Apfelbaum wrote:
> > Commit: 501f28ca9db08e84819b26314525b6369e7704dd
> >     tests: rename acpi-test to bios-tables-test
> > 
> > modified acpi-test file from acpi-test.c to bios-tables-test.c.
> > However, the tables regeneration script was not modified
> > accordingly.
> > 
> > Fixed the test name also in rebuild-expected-aml.sh script.
> 
> Mini PING
> 
> Thanks,
> Marcel

Thanks!
I already merged an equivalent patch by Paolo.


> > 
> > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> > ---
> >  tests/acpi-test-data/rebuild-expected-aml.sh | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh
> > index ab98498..e7ce2b3 100755
> > --- a/tests/acpi-test-data/rebuild-expected-aml.sh
> > +++ b/tests/acpi-test-data/rebuild-expected-aml.sh
> > @@ -12,6 +12,7 @@
> >  # See the COPYING.LIB file in the top-level directory.
> >  
> >  qemu=
> > +acpi_test_path="tests/bios-tables-test"
> >  
> >  if [ -e x86_64-softmmu/qemu-system-x86_64 ]; then
> >      qemu="x86_64-softmmu/qemu-system-x86_64"
> > @@ -23,13 +24,13 @@ else
> >      exit 1;
> >  fi
> >  
> > -if [ ! -e "tests/acpi-test" ]; then
> > -    echo "Test: acpi-test is required! Run make check before this script."
> > +if [ ! -e $acpi_test_path ]; then
> > +    echo "Test: $acpi_test_path 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/acpi-test
> > +TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu $acpi_test_path
> >  
> >  echo "The files were rebuilt and can be added to git."
> >  echo "However, if new files were created, please copy them manually" \
> 
>