On 10/26/20 2:51 PM, Paolo Bonzini wrote: > Apple's nm implementation includes empty lines in the output that are not > found in GNU binutils. This confuses scripts/undefsym.py, though it did > not confuse the scripts/undefsym.sh script that it replaced. To fix > this, ignore lines that do not have two fields. > > Reported-by: Emmanuel Blot <eblot...@gmail.com> > Tested-by: Emmanuel Blot <eblot...@gmail.com> > Fixes: 604f3e4e90 ("meson: Convert undefsym.sh to undefsym.py", 2020-09-08) > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > .cirrus.yml | 2 +- > scripts/undefsym.py | 11 +++++------ > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/.cirrus.yml b/.cirrus.yml > index 81a2960b1a..900437dd2a 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -40,7 +40,7 @@ macos_xcode_task: > script: > - mkdir build > - cd build > - - ../configure --extra-cflags='-Wno-error=deprecated-declarations' > + - ../configure --extra-cflags='-Wno-error=deprecated-declarations' > --enable-modules > --enable-werror --cc=clang || { cat config.log > meson-logs/meson-log.txt; exit 1; }
I'm confused as this broke the catalina-xcode test: PASS 5 qtest-aarch64/device-introspect-test /aarch64/device/introspect/abstract-interfaces missing object type 'virtio-gpu-device' Broken pipe ../tests/qtest/libqtest.c:176: kill_qemu() detected QEMU death from signal 6 (Abort trap: 6) ERROR qtest-aarch64/device-introspect-test - too few tests run (expected 6, got 5) gmake: *** [Makefile.mtest:905: run-test-111] Error 1