| Message ID | 1388054651-13764-2-git-send-email-marcel.a@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Dec 26, 2013 at 12:44:10PM +0200, Marcel Apfelbaum wrote: > Acpi unit-test will fail every time the acpi tables change. > This script rebuilds the expected aml files, so the test > will pass. It also validates the modifications. > > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> > --- > tests/acpi-test-data/rebuild-expected-aml.sh | 36 ++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > create mode 100755 tests/acpi-test-data/rebuild-expected-aml.sh > > diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh > new file mode 100755 > index 0000000..8039718 > --- /dev/null > +++ b/tests/acpi-test-data/rebuild-expected-aml.sh > @@ -0,0 +1,36 @@ > +#! /bin/bash > + > +# > +# Rebuild expected AML files for acpi unit-test > +# > +# Copyright (c) 2013 Red Hat Inc. > +# > +# Authors: > +# Marcel Apfelbaum <marcel.a@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 "Qemu executable qemu-system-x86_64 or qemu-system-i386 is required!" maybe add "run make to build the executable" > + echo "Run this script from the build directory." > + exit -1; > +fi > + > +if [ ! -e "tests/acpi-test" ]; then > + echo "Test: acpi-test is required! Run make check before this script." > + echo "Run this script from the build directory." > + exit -1; you want exit 1 or some other positive value. > +fi > + > +ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/acpi-test > + > +echo "The files were rebuild and can be added to git." rebuilt > +echo "However, if new files were created, please copy them manually" \ > + "to tests/acpi-test-data/pc/ or tests/acpi-test-data/q35/ ." > -- > 1.8.3.1
On Thu, 2013-12-26 at 12:53 +0200, Michael S. Tsirkin wrote: > On Thu, Dec 26, 2013 at 12:44:10PM +0200, Marcel Apfelbaum wrote: > > Acpi unit-test will fail every time the acpi tables change. > > This script rebuilds the expected aml files, so the test > > will pass. It also validates the modifications. > > > > Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> > > --- > > tests/acpi-test-data/rebuild-expected-aml.sh | 36 ++++++++++++++++++++++++++++ > > 1 file changed, 36 insertions(+) > > create mode 100755 tests/acpi-test-data/rebuild-expected-aml.sh > > > > diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh > > new file mode 100755 > > index 0000000..8039718 > > --- /dev/null > > +++ b/tests/acpi-test-data/rebuild-expected-aml.sh > > @@ -0,0 +1,36 @@ > > +#! /bin/bash > > + > > +# > > +# Rebuild expected AML files for acpi unit-test > > +# > > +# Copyright (c) 2013 Red Hat Inc. > > +# > > +# Authors: > > +# Marcel Apfelbaum <marcel.a@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 "Qemu executable qemu-system-x86_64 or qemu-system-i386 is required!" > > maybe add "run make to build the executable" OK > > > + echo "Run this script from the build directory." > > + exit -1; > > +fi > > + > > +if [ ! -e "tests/acpi-test" ]; then > > + echo "Test: acpi-test is required! Run make check before this script." > > + echo "Run this script from the build directory." > > + exit -1; > > you want exit 1 or some other positive value. Sure > > > +fi > > + > > +ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/acpi-test > > + > > +echo "The files were rebuild and can be added to git." > > rebuilt Sure, Thanks, Marcel > > > +echo "However, if new files were created, please copy them manually" \ > > + "to tests/acpi-test-data/pc/ or tests/acpi-test-data/q35/ ." > > -- > > 1.8.3.1
diff --git a/tests/acpi-test-data/rebuild-expected-aml.sh b/tests/acpi-test-data/rebuild-expected-aml.sh new file mode 100755 index 0000000..8039718 --- /dev/null +++ b/tests/acpi-test-data/rebuild-expected-aml.sh @@ -0,0 +1,36 @@ +#! /bin/bash + +# +# Rebuild expected AML files for acpi unit-test +# +# Copyright (c) 2013 Red Hat Inc. +# +# Authors: +# Marcel Apfelbaum <marcel.a@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 "Qemu executable qemu-system-x86_64 or qemu-system-i386 is required!" + echo "Run this script from the build directory." + exit -1; +fi + +if [ ! -e "tests/acpi-test" ]; then + echo "Test: acpi-test is required! Run make check before this script." + echo "Run this script from the build directory." + exit -1; +fi + +ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu tests/acpi-test + +echo "The files were rebuild and can be added to git." +echo "However, if new files were created, please copy them manually" \ + "to tests/acpi-test-data/pc/ or tests/acpi-test-data/q35/ ."
Acpi unit-test will fail every time the acpi tables change. This script rebuilds the expected aml files, so the test will pass. It also validates the modifications. Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> --- tests/acpi-test-data/rebuild-expected-aml.sh | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 tests/acpi-test-data/rebuild-expected-aml.sh