Message ID | 20200306165751.18986-1-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tests/qemu-iotests: Fix socket_scm_helper build path | expand |
Patchew URL: https://patchew.org/QEMU/20200306165751.18986-1-philmd@redhat.com/ Hi, This series failed the docker-clang@ubuntu build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally. === TEST SCRIPT BEGIN === #!/bin/bash make docker-image-ubuntu V=1 NETWORK=1 time make docker-test-clang@ubuntu SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END === GEN i386-softmmu/config-devices.h GEN i386-softmmu/config-target.h CC i386-softmmu/exec.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6/usr/bin/ld : /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC aarch64-softmmu/exec-vary.o CC aarch64-softmmu/tcg/tcg.o CC alpha-softmmu/exec-vary.o --- CC mips64-softmmu/hw/9pfs/virtio-9p-device.o CC aarch64-softmmu/hw/arm/netduinoplus2.o CC mipsel-softmmu/migration/ram.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC aarch64-softmmu/hw/arm/nseries.o CC mips64el-softmmu/accel/tcg/translator.o CC mips64-softmmu/hw/block/virtio-blk.o --- CC mips64-softmmu/hw/net/rocker/qmp-norocker.o CC aarch64-softmmu/hw/arm/sabrelite.o CC mips64el-softmmu/hw/misc/mips_itu.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mips64-softmmu/hw/rtc/mc146818rtc.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mipsel-softmmu/hw/block/vhost-user-blk.o GEN trace/generated-helpers.c CC i386-softmmu/hw/i386/kvmvapic.o --- CC nios2-softmmu/exec-vary.o CC mipsel-softmmu/hw/net/virtio-net.o CC mips64el-softmmu/hw/semihosting/console.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mipsel-softmmu/hw/net/rocker/qmp-norocker.o CC nios2-softmmu/tcg/tcg.o CC mips64-softmmu/hw/vfio/display.o --- CC ppc-softmmu/gdbstub.o CC ppc-softmmu/balloon.o GEN trace/generated-helpers.c /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC nios2-softmmu/trace/control-target.o CC aarch64-softmmu/target/arm/arm-semi.o GEN trace/generated-helpers.c --- CC or1k-softmmu/qapi/qapi-types-machine-target.o CC mips64el-softmmu/target/mips/op_helper.o CC mips64el-softmmu/target/mips/cp0_helper.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK i386-softmmu/qemu-system-i386 CC aarch64-softmmu/target/arm/gdbstub64.o CC arm-softmmu/target/arm/gdbstub.o --- CC mips64el-softmmu/target/mips/fpu_helper.o CC or1k-softmmu/qapi/qapi-types.o GEN trace/generated-helpers.c /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mipsel-softmmu/trace/control-target.o CC or1k-softmmu/qapi/qapi-visit-machine-target.o CC ppc64-softmmu/accel/stubs/kvm-stub.o --- CC mips64el-softmmu/trace/generated-helpers.o CC ppc64-softmmu/hw/9pfs/virtio-9p-device.o GEN arm-softmmu/target/arm/decode-a32-uncond.inc.c /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC ppc-softmmu/hw/block/virtio-blk.o CC ppc-softmmu/hw/block/vhost-user-blk.o CC ppc-softmmu/hw/block/dataplane/virtio-blk.o --- CC or1k-softmmu/softmmu/main.o CC ppc64-softmmu/hw/display/vga.o CC arm-softmmu/target/arm/neon_helper.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC riscv32-softmmu/exec-vary.o CC arm-softmmu/target/arm/m_helper.o CC arm-softmmu/target/arm/psci.o --- GEN sh4eb-softmmu/config-target.h CC sh4eb-softmmu/exec.o CC riscv32-softmmu/tcg/tcg-common.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC riscv32-softmmu/tcg/optimize.o CC ppc-softmmu/hw/scsi/vhost-scsi-common.o CC ppc64-softmmu/hw/display/virtio-vga.o --- GEN s390x-softmmu/gdbstub-xml.c GEN riscv32-softmmu/gdbstub-xml.c CC sparc-softmmu/exec-vary.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC sh4eb-softmmu/tcg/tcg-op-vec.o CC sparc-softmmu/tcg/tcg.o CC sh4eb-softmmu/tcg/tcg-op-gvec.o --- CC riscv64-softmmu/hw/riscv/sifive_plic.o CC riscv32-softmmu/hw/riscv/sifive_plic.o CC sparc-softmmu/target/sparc/gdbstub.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 GEN trace/generated-helpers.c CC ppc-softmmu/qapi/qapi-events.o CC s390x-softmmu/hw/virtio/virtio-rng-pci.o --- CC unicore32-softmmu/accel/tcg/tcg-all.o CC sparc64-softmmu/hw/virtio/virtio-scsi-pci.o GEN riscv32-softmmu/target/riscv/decode_insn32.inc.c /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC ppc-softmmu/target/ppc/fpu_helper.o CC sh4eb-softmmu/target/sh4/helper.o CC sh4eb-softmmu/target/sh4/cpu.o --- CC unicore32-softmmu/qapi/qapi-visit-machine-target.o CC x86_64-softmmu/accel/tcg/cpu-exec-common.o CC sparc64-softmmu/qapi/qapi-events.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC sparc64-softmmu/qapi/qapi-commands-machine-target.o CC s390x-softmmu/hw/s390x/s390-pci-bus.o CC ppc-softmmu/softmmu/main.o --- CC sparc64-softmmu/target/sparc/cc_helper.o CC ppc64-softmmu/hw/ppc/mpc8544_guts.o CC sparc64-softmmu/target/sparc/win_helper.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC ppc64-softmmu/hw/ppc/ppce500_spin.o CC x86_64-softmmu/hw/core/machine-qmp-cmds.o CC x86_64-softmmu/hw/display/vga.o --- GEN aarch64-linux-user/config-target.h CC aarch64-linux-user/exec.o CC aarch64-linux-user/exec-vary.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC xtensaeb-softmmu/exec-vary.o CC xtensa-softmmu/memory_mapping.o CC xtensaeb-softmmu/tcg/tcg.o --- CC x86_64-softmmu/hw/scsi/vhost-scsi.o CC x86_64-softmmu/hw/scsi/vhost-user-scsi.o CC x86_64-softmmu/hw/tpm/tpm_ppi.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC xtensa-softmmu/accel/tcg/cpu-exec-common.o CC aarch64-linux-user/gdbstub.o CC xtensaeb-softmmu/qtest.o --- CC xtensaeb-softmmu/hw/display/vhost-user-gpu.o CC xtensaeb-softmmu/hw/display/virtio-gpu-pci.o LINK ppc64-softmmu/qemu-system-ppc64 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC xtensaeb-softmmu/hw/display/vhost-user-gpu-pci.o CC xtensa-softmmu/hw/vfio/pci-quirks.o CC x86_64-softmmu/hw/virtio/virtio-iommu-pci.o --- CC xtensaeb-softmmu/hw/virtio/virtio-scsi-pci.o CC x86_64-softmmu/hw/i386/kvm/ioapic.o CC aarch64-linux-user/target/arm/m_helper.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC aarch64-linux-user/target/arm/translate-a64.o CC aarch64_be-linux-user/target/arm/m_helper.o CC xtensa-softmmu/qapi/qapi-types-machine-target.o --- CC m68k-linux-user/linux-user/signal.o CC i386-linux-user/target/i386/mem_helper.o CC m68k-linux-user/linux-user/elfload.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC microblaze-linux-user/accel/tcg/user-exec.o GEN microblazeel-linux-user/config-target.h CC microblazeel-linux-user/exec.o --- CC mips-linux-user/tcg/tcg.o CC m68k-linux-user/linux-user/uname.o CC mipsel-linux-user/exec-vary.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC microblaze-linux-user/linux-user/strace.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC mips64-linux-user/tcg/tcg.o CCAS m68k-linux-user/linux-user/safe-syscall.o CC i386-linux-user/target/i386/smm_helper.o --- CC xtensa-linux-user/tcg/tcg-common.o CC sh4eb-linux-user/trace/control-target.o CC tilegx-linux-user/disas.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC tilegx-linux-user/gdbstub.o CC tilegx-linux-user/thunk.o CC sparc64-linux-user/gdbstub.o --- CC f128M_eq_signaling.o CC f128M_lt_quiet.o CC f128M_le_quiet.o /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 CC softfloat_raiseFlags.o CC s_f16UIToCommonNaN.o CC s_commonNaNToF16UI.o --- AR libsoftfloat.a LINK tests/test-throttle LINK tests/test-thread-pool /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-hbitmap LINK fp-test LINK tests/test-bdrv-drain /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-bdrv-graph-mod /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-blockjob LINK tests/test-blockjob-txn LINK tests/test-block-backend LINK tests/test-block-iothread LINK tests/test-image-locking LINK tests/test-x86-cpuid /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-xbzrle /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-vmstate LINK tests/test-cutils /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-shift128 /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-mul64 LINK tests/test-int128 LINK tests/rcutorture --- LINK tests/test-crypto-hash LINK tests/test-crypto-hmac LINK tests/test-crypto-cipher /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 LINK tests/test-crypto-secret LINK tests/test-crypto-tlscredsx509 LINK tests/test-crypto-tlssession --- FLOAT TEST lt_quiet FLOAT TEST add FLOAT TEST sub /usr/bin/ld: /lib/x86_64-linux-gnu/libtirpc.so.3: warning: common of `rpc_createerr@@GLIBC_2.2.5' overridden by definition from /lib/x86_64-linux-gnu/libc.so.6 FLOAT TEST uint-to-float FLOAT TEST float-to-int FLOAT TEST mul --- dbus-daemon[7882]: Could not get password database information for UID of current process: User "???" unknown or no memory to allocate password entry ** ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) Aborted (core dumped) cleaning up pid 7882 make: *** [/tmp/qemu-test/src/tests/Makefile.include:633: check-qtest-i386] Error 1 make: *** Waiting for unfinished jobs.... Looking for expected file 'tests/data/acpi/pc/FACP.numamem' --- dbus-daemon[9164]: Could not get password database information for UID of current process: User "???" unknown or no memory to allocate password entry ** ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) Aborted (core dumped) cleaning up pid 9164 ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/dbus-vmstate-test.c:114:get_connection: assertion failed (err == NULL): The connection is closed (g-io-error-quark, 18) make: *** [/tmp/qemu-test/src/tests/Makefile.include:633: check-qtest-x86_64] Error 1 TEST check-qtest-aarch64: tests/qtest/qom-test TEST check-qtest-arm: tests/qtest/test-hmp TEST check-qtest-arm: tests/qtest/qos-test --- raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=b28da1a67cc4408d8eafbe885a22c0af', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-ap42nn__/src/docker-src.2020-03-06-12.04.27.17752:/var/tmp/qemu:z,ro', 'qemu:ubuntu', '/var/tmp/qemu/run', 'test-clang']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=b28da1a67cc4408d8eafbe885a22c0af make[1]: *** [docker-run] Error 1 make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-ap42nn__/src' make: *** [docker-run-test-clang@ubuntu] Error 2 real 18m45.171s user 0m8.589s The full log is available at http://patchew.org/logs/20200306165751.18986-1-philmd@redhat.com/testing.docker-clang@ubuntu/?type=message. --- Email generated automatically by Patchew [https://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
Le 06/03/2020 à 17:57, Philippe Mathieu-Daudé a écrit : > The socket_scm_helper path got corrupted during the mechanical > refactor moving the qtests files into their own sub-directory. > > Fixes: 1e8a1fae7 ("test: Move qtests to a separate directory") > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/Makefile.include | 1 + > tests/qtest/Makefile.include | 1 - > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index edcbd475aa..67e8fcddda 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -589,6 +589,7 @@ include $(SRC_PATH)/tests/qtest/Makefile.include > tests/test-qga$(EXESUF): qemu-ga$(EXESUF) > tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) > tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a > +tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o > > SPEED = quick > > diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include > index 383b0ab217..76672990a7 100644 > --- a/tests/qtest/Makefile.include > +++ b/tests/qtest/Makefile.include > @@ -287,7 +287,6 @@ tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(libqos > tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(libqos-usb-obj-y) > tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o > tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o tests/qtest/migration-helpers.o > -tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qemu-iotests/qtest/socket_scm_helper.o > tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-obj-y) > tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o $(qtest-obj-y) > tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.o $(qtest-obj-y) > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Am 06.03.2020 um 17:57 hat Philippe Mathieu-Daudé geschrieben: > The socket_scm_helper path got corrupted during the mechanical > refactor moving the qtests files into their own sub-directory. > > Fixes: 1e8a1fae7 ("test: Move qtests to a separate directory") > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Thanks, applied to the block branch. Kevin
diff --git a/tests/Makefile.include b/tests/Makefile.include index edcbd475aa..67e8fcddda 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -589,6 +589,7 @@ include $(SRC_PATH)/tests/qtest/Makefile.include tests/test-qga$(EXESUF): qemu-ga$(EXESUF) tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a +tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o SPEED = quick diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include index 383b0ab217..76672990a7 100644 --- a/tests/qtest/Makefile.include +++ b/tests/qtest/Makefile.include @@ -287,7 +287,6 @@ tests/qtest/usb-hcd-ehci-test$(EXESUF): tests/qtest/usb-hcd-ehci-test.o $(libqos tests/qtest/usb-hcd-xhci-test$(EXESUF): tests/qtest/usb-hcd-xhci-test.o $(libqos-usb-obj-y) tests/qtest/cpu-plug-test$(EXESUF): tests/qtest/cpu-plug-test.o tests/qtest/migration-test$(EXESUF): tests/qtest/migration-test.o tests/qtest/migration-helpers.o -tests/qtest/qemu-iotests/qtest/socket_scm_helper$(EXESUF): tests/qtest/qemu-iotests/qtest/socket_scm_helper.o tests/qtest/test-netfilter$(EXESUF): tests/qtest/test-netfilter.o $(qtest-obj-y) tests/qtest/test-filter-mirror$(EXESUF): tests/qtest/test-filter-mirror.o $(qtest-obj-y) tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.o $(qtest-obj-y)
The socket_scm_helper path got corrupted during the mechanical refactor moving the qtests files into their own sub-directory. Fixes: 1e8a1fae7 ("test: Move qtests to a separate directory") Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/Makefile.include | 1 + tests/qtest/Makefile.include | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)