> -----Original Message----- > From: Michael S. Tsirkin [mailto:m...@redhat.com] > Sent: 15 January 2020 13:46 > To: Shameerali Kolothum Thodi <shameerali.kolothum.th...@huawei.com> > Cc: Thomas Huth <th...@redhat.com>; qemu-devel@nongnu.org; > imamm...@redhat.com; xuwei (O) <xuw...@huawei.com>; Linuxarm > <linux...@huawei.com> > Subject: Re: [PATCH] tests: acpi: update path in rebuild-expected-aml > > On Wed, Jan 15, 2020 at 11:01:44AM +0000, Shameerali Kolothum Thodi > wrote: > > > > > > > -----Original Message----- > > > From: Thomas Huth [mailto:th...@redhat.com] > > > Sent: 14 January 2020 17:08 > > > To: Shameerali Kolothum Thodi > > > <shameerali.kolothum.th...@huawei.com>; > > > qemu-devel@nongnu.org; imamm...@redhat.com; m...@redhat.com > > > Cc: xuwei (O) <xuw...@huawei.com>; Linuxarm <linux...@huawei.com> > > > Subject: Re: [PATCH] tests: acpi: update path in > > > rebuild-expected-aml > > > > > > On 14/01/2020 17.51, Shameer Kolothum wrote: > > > > Since commit 1e8a1fae7464("test: Move qtests to a separate > > > > directory") qtests are now placed in a separate folder and this > > > > breaks the script used to rebuild the expected ACPI tables for > > > > bios-tables-test. Update the script with correct path. > > > > > > > > Fixes: 1e8a1fae7464("test: Move qtests to a separate directory") > > > > Signed-off-by: Shameer Kolothum > > > > <shameerali.kolothum.th...@huawei.com> > > > > --- > > > > tests/data/acpi/rebuild-expected-aml.sh | 6 +++--- > > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > > > diff --git a/tests/data/acpi/rebuild-expected-aml.sh > > > b/tests/data/acpi/rebuild-expected-aml.sh > > > > index f89d4624bc..d44e511533 100755 > > > > --- a/tests/data/acpi/rebuild-expected-aml.sh > > > > +++ b/tests/data/acpi/rebuild-expected-aml.sh > > > > @@ -14,7 +14,7 @@ > > > > > > > > qemu_bins="x86_64-softmmu/qemu-system-x86_64 > > > aarch64-softmmu/qemu-system-aarch64" > > > > > > > > -if [ ! -e "tests/bios-tables-test" ]; then > > > > +if [ ! -e "tests/qtest/bios-tables-test" ]; then > > > > echo "Test: bios-tables-test is required! Run make check > > > > before this > > > script." > > > > echo "Run this script from the build directory." > > > > exit 1; > > > > @@ -26,11 +26,11 @@ for qemu in $qemu_bins; do > > > > 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 > > > > + TEST_ACPI_REBUILD_AML=y QTEST_QEMU_BINARY=$qemu > > > tests/qtest/bios-tables-test > > > > done > > > > > > > > eval `grep SRC_PATH= config-host.mak` > > > > > > > > -echo '/* List of comma-separated changed AML files to ignore */' > > > > > > > > ${SRC_PATH}/tests/bios-tables-test-allowed-diff.h > > > > +echo '/* List of comma-separated changed AML files to ignore */' > > > > +> > > > ${SRC_PATH}/tests/qtest/bios-tables-test-allowed-diff.h > > > > > > > > echo "The files were rebuilt and can be added to git." > > > > > > Oh, sorry for missing that in my patch series ... is there maybe a > > > way that we could test this script in one of our CI pipelines so > > > that it is not so easy to miss? > > > > Right. That will be a useful one. > > > > I am also seeing another error when I run "make check-qtest" on x86_64. > > This doesn’t seems to be related to the recent changes. I have gone > > back to 4.1.0 and it is still there. > > > > TEST check-qtest-x86_64: tests/boot-order-test > > TEST check-qtest-x86_64: tests/bios-tables-test > > Could not access KVM kernel module: No such file or directory > > qemu-system-x86_64: failed to initialize KVM: No such file or > > directory > > qemu-system-x86_64: Back to tcg accelerator Could not access KVM > > kernel module: No such file or directory > > qemu-system-x86_64: failed to initialize KVM: No such file or > > directory > > qemu-system-x86_64: Back to tcg accelerator Could not access KVM > > kernel module: No such file or directory > > qemu-system-x86_64: failed to initialize KVM: No such file or > > directory > > qemu-system-x86_64: Back to tcg accelerator > > acpi-test: Warning! FACP binary file mismatch. Actual [aml:/tmp/aml-2Q9EE0], > Expected [aml:tests/data/acpi/pc/FACP.bridge]. > > acpi-test: Warning! FACP mismatch. Actual [asl:/tmp/asl-CQ9EE0.dsl, > aml:/tmp/aml-2Q9EE0], Expected [asl:/tmp/asl-N18EE0.dsl, > aml:tests/data/acpi/pc/FACP.bridge]. > > ** > > ERROR:tests/bios-tables-test.c:447:test_acpi_asl: assertion failed: > > (all_tables_match) ERROR - Bail out! > > ERROR:tests/bios-tables-test.c:447:test_acpi_asl: assertion failed: > > (all_tables_match) Aborted (core dumped) > > /home/shameer/qemu/tests/Makefile.include:899: recipe for target > > 'check-qtest-x86_64' failed > > make: *** [check-qtest-x86_64] Error 1 > > Well make check seems to pass for me ... What's different for you?
I tried a fresh git clone of qemu and that seems to work fine. So I guess it might be something to do with my earlier setup. Ignore and sorry for the noise. Thanks, Shameer
