* [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped
2018-12-17 23:16 [Qemu-devel] [PULL 00/35] Misc patches for 2018-12-18 Paolo Bonzini
@ 2018-12-17 23:16 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-17 23:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Thomas Huth
Sometimes a test's main() function recognizes that the environment
does not support the test, and therefore exits. In this case, we
still should run g_test_run() so that a TAP harness will print the
test plan ("1..0") and the test will be marked as skipped.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/cdrom-test.c | 2 +-
tests/migration-test.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
index 9b43dc9ab4..14bd981336 100644
--- a/tests/cdrom-test.c
+++ b/tests/cdrom-test.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
if (exec_genisoimg(genisocheck)) {
/* genisoimage not available - so can't run tests */
- return 0;
+ return g_test_run();
}
ret = prepare_image(arch, isoimage);
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 06ca5068d8..8352612364 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -789,7 +789,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
if (!ufd_version_check()) {
- return 0;
+ return g_test_run();
}
/*
@@ -800,7 +800,7 @@ int main(int argc, char **argv)
if (g_str_equal(qtest_get_arch(), "ppc64") &&
access("/sys/module/kvm_hv", F_OK)) {
g_test_message("Skipping test: kvm_hv not available");
- return 0;
+ return g_test_run();
}
/*
@@ -811,11 +811,11 @@ int main(int argc, char **argv)
#if defined(HOST_S390X)
if (access("/dev/kvm", R_OK | W_OK)) {
g_test_message("Skipping test: kvm not available");
- return 0;
+ return g_test_run();
}
#else
g_test_message("Skipping test: Need s390x host to work properly");
- return 0;
+ return g_test_run();
#endif
}
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped
2018-12-19 15:18 [Qemu-devel] [PULL v2 00/35] Misc patches for 2018-12-18 Paolo Bonzini
@ 2018-12-19 15:19 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-19 15:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Thomas Huth
Sometimes a test's main() function recognizes that the environment
does not support the test, and therefore exits. In this case, we
still should run g_test_run() so that a TAP harness will print the
test plan ("1..0") and the test will be marked as skipped.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/cdrom-test.c | 2 +-
tests/ivshmem-test.c | 5 ++---
tests/migration-test.c | 8 ++++----
tests/test-crypto-pbkdf.c | 4 +++-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
index 9b43dc9ab4..14bd981336 100644
--- a/tests/cdrom-test.c
+++ b/tests/cdrom-test.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
if (exec_genisoimg(genisocheck)) {
/* genisoimage not available - so can't run tests */
- return 0;
+ return g_test_run();
}
ret = prepare_image(arch, isoimage);
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index 089e268154..fe5eb304b1 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -492,7 +492,7 @@ int main(int argc, char **argv)
/* shm */
tmpshm = mktempshm(TMPSHMSIZE, &fd);
if (!tmpshm) {
- return 0;
+ goto out;
}
tmpshmem = mmap(0, TMPSHMSIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
g_assert(tmpshmem != MAP_FAILED);
@@ -514,9 +514,8 @@ int main(int argc, char **argv)
}
}
+out:
ret = g_test_run();
-
cleanup();
-
return ret;
}
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 06ca5068d8..8352612364 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -789,7 +789,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
if (!ufd_version_check()) {
- return 0;
+ return g_test_run();
}
/*
@@ -800,7 +800,7 @@ int main(int argc, char **argv)
if (g_str_equal(qtest_get_arch(), "ppc64") &&
access("/sys/module/kvm_hv", F_OK)) {
g_test_message("Skipping test: kvm_hv not available");
- return 0;
+ return g_test_run();
}
/*
@@ -811,11 +811,11 @@ int main(int argc, char **argv)
#if defined(HOST_S390X)
if (access("/dev/kvm", R_OK | W_OK)) {
g_test_message("Skipping test: kvm not available");
- return 0;
+ return g_test_run();
}
#else
g_test_message("Skipping test: Need s390x host to work properly");
- return 0;
+ return g_test_run();
#endif
}
diff --git a/tests/test-crypto-pbkdf.c b/tests/test-crypto-pbkdf.c
index d937aff6b2..f32e0fbea2 100644
--- a/tests/test-crypto-pbkdf.c
+++ b/tests/test-crypto-pbkdf.c
@@ -440,6 +440,8 @@ int main(int argc, char **argv)
#else
int main(int argc, char **argv)
{
- return 0;
+ g_test_init(&argc, &argv, NULL);
+ g_test_skip();
+ return g_test_run();
}
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18
@ 2018-12-20 12:36 Paolo Bonzini
2018-12-20 12:36 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-12-20 17:38 ` [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Peter Maydell
0 siblings, 2 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-20 12:36 UTC (permalink / raw)
To: qemu-devel
The following changes since commit e85c577158a2e8e252414959da9ef15c12eec63d:
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-17' into staging (2018-12-18 14:31:06 +0000)
are available in the Git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to b4e8bbb9ae50045160957e7ab66c4f1cae535ea4:
avoid TABs in files that only contain a few (2018-12-19 16:03:22 +0100)
----------------------------------------------------------------
* HAX support for Linux hosts (Alejandro)
* esp bugfixes (Guenter)
* Windows build cleanup (Marc-André)
* checkpatch logic improvements (Paolo)
* coalesced range bugfix (Paolo)
* switch testsuite to TAP (Paolo)
* QTAILQ rewrite (Paolo)
* block/iscsi.c cancellation fixes (Stefan)
* improve selection of the default accelerator (Thomas)
----------------------------------------------------------------
v1->v2: more g_test_run fixes
do not force-enable colors
v2->v3: more g_test_run fixes
Alexandro Sanchez Bach (1):
hax: Support for Linux hosts
Guenter Roeck (2):
esp-pci: Fix status register write erase control
scsi: esp: Defer command completion until previous interrupts have been handled
Marc-André Lureau (5):
vhost-user-bridge: fix "unknown type name" compilation error
build-sys: don't include windows.h, osdep.h does it
build-sys: move windows defines in osdep.h header
build-sys: build with Vista API by default
qga: drop < Vista compatibility
Paolo Bonzini (21):
checkpatch: fix premature exit when no input or --mailback
checkpatch: check Signed-off-by in --mailback mode
checkpatch: improve handling of multiple patches or files
checkpatch: colorize output to terminal
pam: wrap MemoryRegion initialization in a transaction
memory: extract flat_range_coalesced_io_{del,add}
memory: avoid unnecessary coalesced_io_del operations
memory: update coalesced_range on transaction_commit
test: execute g_test_run when tests are skipped
test: replace gtester with a TAP driver
qemu/queue.h: do not access tqe_prev directly
vfio: make vfio_address_spaces static
qemu/queue.h: leave head structs anonymous unless necessary
qemu/queue.h: typedef QTAILQ heads
qemu/queue.h: remove Q_TAILQ_{HEAD,ENTRY}
qemu/queue.h: reimplement QTAILQ without pointer-to-pointers
qemu/queue.h: simplify reverse access to QTAILQ
checkpatch: warn about qemu/queue.h head structs that are not typedef-ed
scripts: add script to convert multiline comments into 4-line format
remove space-tab sequences
avoid TABs in files that only contain a few
Peng Hao (1):
hw/watchdog/wdt_i6300esb: remove a unnecessary comment
Stefan Hajnoczi (4):
block/iscsi: drop unused IscsiAIOCB->buf field
block/iscsi: take iscsilun->mutex in iscsi_timed_check_events()
block/iscsi: fix ioctl cancel use-after-free
block/iscsi: cancel libiscsi task when ABORT TASK TMF completes
Thomas Huth (1):
accel: Improve selection of the default accelerator
accel/accel.c | 18 +-
accel/kvm/kvm-all.c | 4 +-
accel/tcg/translate-all.c | 4 -
block/bochs.c | 22 +-
block/file-posix.c | 2 +-
block/file-win32.c | 8 +-
block/gluster.c | 2 +-
block/iscsi.c | 47 +++-
block/linux-aio.c | 4 +-
block/mirror.c | 2 +-
block/qcow2-bitmap.c | 4 +-
block/qcow2-cluster.c | 2 +-
block/qcow2.h | 5 +-
block/sheepdog.c | 6 +-
block/vhdx.h | 2 +-
block/vpc.c | 2 +-
blockdev.c | 4 +-
bsd-user/elfload.c | 2 +-
bsd-user/x86_64/target_syscall.h | 2 +-
configure | 3 -
contrib/elf2dmp/main.c | 2 +-
contrib/ivshmem-client/ivshmem-client.h | 4 +-
contrib/ivshmem-server/ivshmem-server.h | 5 +-
cpus-common.c | 2 +-
crypto/aes.c | 28 +-
disas/alpha.c | 8 +-
disas/arm.c | 2 +-
disas/i386.c | 4 +-
disas/m68k.c | 4 +-
dump.c | 2 +-
exec.c | 5 +-
fsdev/qemu-fsdev.c | 2 +-
hw/alpha/typhoon.c | 12 +-
hw/arm/stellaris.c | 2 +-
hw/block/nvme.h | 8 +-
hw/block/xen_disk.c | 6 +-
hw/char/sh_serial.c | 18 +-
hw/char/virtio-serial-bus.c | 2 +-
hw/char/xen_console.c | 58 ++--
hw/core/loader.c | 28 +-
hw/core/qdev.c | 4 +-
hw/core/reset.c | 2 +-
hw/display/tc6393xb.c | 6 +-
hw/display/vga.c | 8 +-
hw/display/virtio-gpu-3d.c | 6 +-
hw/dma/pxa2xx_dma.c | 4 +-
hw/dma/soc_dma.c | 2 +-
hw/gpio/max7310.c | 2 +-
hw/i386/xen/xen-hvm.c | 4 +-
hw/i386/xen/xen-mapcache.c | 2 +-
hw/ide/core.c | 94 +++----
hw/input/lm832x.c | 2 +-
hw/input/pckbd.c | 2 +-
hw/input/tsc210x.c | 2 +-
hw/intc/apic.c | 2 +-
hw/mips/gt64xxx_pci.c | 6 +-
hw/mips/mips_r4k.c | 4 +-
hw/misc/max111x.c | 6 +-
hw/misc/omap_l4.c | 4 +-
hw/net/mipsnet.c | 16 +-
hw/net/ne2000.c | 44 ++--
hw/net/rocker/rocker.c | 2 +-
hw/net/virtio-net.c | 4 +-
hw/net/vmxnet3.c | 6 +-
hw/pci-host/pam.c | 2 +
hw/pci/msix.c | 2 +-
hw/pci/pci.c | 44 ++--
hw/pci/pci_bridge.c | 2 +-
hw/ppc/ppc405_uc.c | 2 +-
hw/ppc/prep.c | 4 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/scsi/esp-pci.c | 10 +-
hw/scsi/esp.c | 33 ++-
hw/scsi/lsi53c895a.c | 6 +-
hw/scsi/scsi-bus.c | 2 +-
hw/scsi/trace-events | 1 +
hw/sh4/r2d.c | 16 +-
hw/usb/ccid-card-emulated.c | 4 +-
hw/usb/combined-packet.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-hid.c | 6 +-
hw/usb/dev-hub.c | 14 +-
hw/usb/dev-mtp.c | 4 +-
hw/usb/dev-network.c | 2 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/hcd-ehci.h | 2 +-
hw/usb/hcd-uhci.c | 8 +-
hw/usb/xen-usb.c | 6 +-
hw/vfio/common.c | 4 +-
hw/watchdog/watchdog.c | 2 +-
hw/watchdog/wdt_i6300esb.c | 1 -
hw/xen/xen_devconfig.c | 2 +-
hw/xen/xen_pvdev.c | 4 +-
hw/xenpv/xen_domainbuild.c | 8 +-
include/elf.h | 10 +-
include/exec/memory.h | 6 +-
include/hw/acpi/acpi.h | 14 +-
include/hw/elf_ops.h | 2 +-
include/hw/ide/internal.h | 2 +-
include/hw/qdev-core.h | 2 +-
include/hw/scsi/esp.h | 2 +
include/hw/sh4/sh_intc.h | 20 +-
include/hw/usb.h | 2 +-
include/hw/vfio/vfio-common.h | 4 +-
include/hw/vfio/vfio-platform.h | 2 +-
include/hw/xen/io/ring.h | 4 +-
include/net/net.h | 2 +-
include/qemu/acl.h | 14 +-
include/qemu/iov.h | 2 +-
include/qemu/option_int.h | 2 +-
include/qemu/osdep.h | 17 ++
include/qemu/queue.h | 153 +++++------
include/qemu/rcu_queue.h | 45 ++--
include/qom/cpu.h | 9 +-
include/scsi/constants.h | 2 +-
include/sysemu/accel.h | 2 +-
include/sysemu/balloon.h | 2 +-
include/sysemu/kvm.h | 2 -
include/sysemu/memory_mapping.h | 2 +-
include/sysemu/rng.h | 2 +-
linux-user/elfload.c | 2 +-
linux-user/linuxload.c | 14 +-
linux-user/main.c | 4 +-
linux-user/mmap.c | 10 +-
linux-user/qemu.h | 4 +-
linux-user/signal.c | 16 +-
linux-user/strace.c | 4 +-
linux-user/syscall.c | 2 +-
linux-user/syscall_defs.h | 4 +-
linux-user/uaccess.c | 2 +-
linux-user/vm86.c | 2 +-
linux-user/x86_64/target_syscall.h | 2 +-
memory.c | 97 ++++---
memory_mapping.c | 2 +-
migration/block-dirty-bitmap.c | 2 +-
migration/block.c | 4 +-
migration/ram.c | 2 +-
monitor.c | 4 +-
nbd/client.c | 2 +-
net/checksum.c | 2 +-
net/filter.c | 2 +-
net/net.c | 2 +-
net/queue.c | 2 +-
net/slirp.c | 2 +-
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 70 +----
qtest.c | 4 +-
scripts/checkpatch.pl | 95 +++++--
scripts/cocci-macro-file.h | 24 +-
scripts/fix-multiline-comments.sh | 62 +++++
scripts/gtester-cat | 26 --
scripts/tap-driver.pl | 378 +++++++++++++++++++++++++++
scripts/tap-merge.pl | 110 ++++++++
slirp/ip_input.c | 4 +-
slirp/slirp.c | 2 +-
slirp/tcp_input.c | 10 +-
slirp/tcp_output.c | 4 +-
slirp/tcp_timer.c | 2 +-
slirp/udp.c | 2 +-
target/alpha/translate.c | 2 +-
target/arm/kvm.c | 2 +-
target/cris/helper.c | 2 +-
target/cris/mmu.h | 10 +-
target/cris/translate_v10.inc.c | 2 +-
target/i386/Makefile.objs | 6 +-
target/i386/hax-i386.h | 6 +-
target/i386/hax-mem.c | 2 +-
target/i386/{hax-darwin.c => hax-posix.c} | 0
target/i386/{hax-darwin.h => hax-posix.h} | 0
target/i386/translate.c | 12 +-
target/mips/translate.c | 2 +-
target/tilegx/translate.c | 2 +-
tcg/i386/tcg-target.inc.c | 4 +-
tcg/tcg.c | 2 +-
tcg/tcg.h | 6 +-
tests/Makefile.include | 54 ++--
tests/cdrom-test.c | 2 +-
tests/docker/dockerfiles/centos7.docker | 1 +
tests/docker/dockerfiles/debian-amd64.docker | 1 +
tests/docker/dockerfiles/debian-ports.docker | 1 +
tests/docker/dockerfiles/debian-sid.docker | 1 +
tests/docker/dockerfiles/debian8.docker | 1 +
tests/docker/dockerfiles/debian9.docker | 1 +
tests/docker/dockerfiles/fedora.docker | 1 +
tests/docker/dockerfiles/ubuntu.docker | 1 +
tests/ivshmem-test.c | 5 +-
tests/libqos/malloc.c | 2 +-
tests/migration-test.c | 8 +-
tests/tcg/alpha/test-cond.c | 4 +-
tests/tcg/arm/hello-arm.c | 20 +-
tests/tcg/cris/check_glibc_kernelversion.c | 8 +-
tests/tcg/cris/check_mmap3.c | 2 +-
tests/tcg/cris/check_openpf1.c | 2 +-
tests/tcg/cris/check_settls1.c | 2 +-
tests/tcg/i386/hello-i386.c | 14 +-
tests/tcg/mips/hello-mips.c | 10 +-
tests/tcg/multiarch/sha1.c | 12 +-
tests/test-crypto-pbkdf.c | 4 +-
tests/test-rcu-list.c | 2 +-
tests/test-vmstate.c | 8 +-
tests/vhost-user-bridge.c | 3 +-
tests/vhost-user-test.c | 4 +-
ui/console.c | 4 +-
ui/input.c | 14 +-
ui/keymaps.h | 4 +-
ui/qemu-pixman.c | 2 +-
ui/vnc-enc-zywrle-template.c | 4 +-
ui/vnc.c | 4 +-
util/bitops.c | 4 +-
util/osdep.c | 4 +-
util/qemu-option.c | 4 +-
util/qemu-sockets.c | 4 +-
util/qemu-thread-win32.c | 4 -
vl.c | 4 +-
214 files changed, 1487 insertions(+), 893 deletions(-)
create mode 100755 scripts/fix-multiline-comments.sh
delete mode 100755 scripts/gtester-cat
create mode 100755 scripts/tap-driver.pl
create mode 100755 scripts/tap-merge.pl
rename target/i386/{hax-darwin.c => hax-posix.c} (100%)
rename target/i386/{hax-darwin.h => hax-posix.h} (100%)
--
2.20.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped
2018-12-20 12:36 [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Paolo Bonzini
@ 2018-12-20 12:36 ` Paolo Bonzini
2018-12-20 17:38 ` [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Peter Maydell
1 sibling, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-20 12:36 UTC (permalink / raw)
To: qemu-devel; +Cc: Eric Blake, Thomas Huth
Sometimes a test's main() function recognizes that the environment
does not support the test, and therefore exits. In this case, we
still should run g_test_run() so that a TAP harness will print the
test plan ("1..0") and the test will be marked as skipped.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/cdrom-test.c | 2 +-
tests/ivshmem-test.c | 5 ++---
tests/migration-test.c | 8 ++++----
tests/test-crypto-pbkdf.c | 4 +++-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
index 9b43dc9ab4..14bd981336 100644
--- a/tests/cdrom-test.c
+++ b/tests/cdrom-test.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
if (exec_genisoimg(genisocheck)) {
/* genisoimage not available - so can't run tests */
- return 0;
+ return g_test_run();
}
ret = prepare_image(arch, isoimage);
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index 089e268154..fe5eb304b1 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -492,7 +492,7 @@ int main(int argc, char **argv)
/* shm */
tmpshm = mktempshm(TMPSHMSIZE, &fd);
if (!tmpshm) {
- return 0;
+ goto out;
}
tmpshmem = mmap(0, TMPSHMSIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
g_assert(tmpshmem != MAP_FAILED);
@@ -514,9 +514,8 @@ int main(int argc, char **argv)
}
}
+out:
ret = g_test_run();
-
cleanup();
-
return ret;
}
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 06ca5068d8..8352612364 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -789,7 +789,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
if (!ufd_version_check()) {
- return 0;
+ return g_test_run();
}
/*
@@ -800,7 +800,7 @@ int main(int argc, char **argv)
if (g_str_equal(qtest_get_arch(), "ppc64") &&
access("/sys/module/kvm_hv", F_OK)) {
g_test_message("Skipping test: kvm_hv not available");
- return 0;
+ return g_test_run();
}
/*
@@ -811,11 +811,11 @@ int main(int argc, char **argv)
#if defined(HOST_S390X)
if (access("/dev/kvm", R_OK | W_OK)) {
g_test_message("Skipping test: kvm not available");
- return 0;
+ return g_test_run();
}
#else
g_test_message("Skipping test: Need s390x host to work properly");
- return 0;
+ return g_test_run();
#endif
}
diff --git a/tests/test-crypto-pbkdf.c b/tests/test-crypto-pbkdf.c
index d937aff6b2..f32e0fbea2 100644
--- a/tests/test-crypto-pbkdf.c
+++ b/tests/test-crypto-pbkdf.c
@@ -440,6 +440,8 @@ int main(int argc, char **argv)
#else
int main(int argc, char **argv)
{
- return 0;
+ g_test_init(&argc, &argv, NULL);
+ g_test_skip();
+ return g_test_run();
}
#endif
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18
2018-12-20 12:36 [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Paolo Bonzini
2018-12-20 12:36 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
@ 2018-12-20 17:38 ` Peter Maydell
2018-12-20 17:41 ` Peter Maydell
1 sibling, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2018-12-20 17:38 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 20 Dec 2018 at 12:37, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit e85c577158a2e8e252414959da9ef15c12eec63d:
>
> Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-17' into staging (2018-12-18 14:31:06 +0000)
>
> are available in the Git repository at:
>
> git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to b4e8bbb9ae50045160957e7ab66c4f1cae535ea4:
>
> avoid TABs in files that only contain a few (2018-12-19 16:03:22 +0100)
>
> ----------------------------------------------------------------
> * HAX support for Linux hosts (Alejandro)
> * esp bugfixes (Guenter)
> * Windows build cleanup (Marc-André)
> * checkpatch logic improvements (Paolo)
> * coalesced range bugfix (Paolo)
> * switch testsuite to TAP (Paolo)
> * QTAILQ rewrite (Paolo)
> * block/iscsi.c cancellation fixes (Stefan)
> * improve selection of the default accelerator (Thomas)
This seemed to work on most of my test hosts but something
weird happened here: hyperlong repetitive command line and
looks like make got an "fwrite(): Resource temporarily unavailable"
halfway through writing it out??
This was on my x86-64 Linux Ubuntu system, clang build
which I configure with '--cc=clang' '--cxx=clang++' '--enable-gtk'
'--extra-cflags=-fsanitize=undefined -fno-sanitize=shift-base -Werror';
the error is during the 'make -C build/clang check V=1' phase.
In any case I think the command lines being produced here
are much too long, compared to the old test driver. This
would be impossible to do a "cut-n-paste the relevant
fragment of the command make ran, so I can retest a
single test in isolation", which is something I do fairly
frequently.
[...]
PASS 56 test-hmp /aarch64/hmp/lm3s811evb
PASS 57 test-hmp /aarch64/hmp/none+2MB
make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/clang'
make: Entering directory '/home/petmay01/linaro/qemu-for-merges/build/clang'
rc=0; { MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 +
1))} QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/endianness-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="endianness-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/fdc-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="fdc-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ide-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ide-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ahci-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ahci-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/hd-geo-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="hd-geo-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/boot-order-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="boot-order-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/bios-tables-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="bios-tables-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/boot-serial-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="boot-serial-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/pxe-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="pxe-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/rtc-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="rtc-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ipmi-kcs-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ipmi-kcs-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ipmi-bt-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ipmi-bt-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/i440fx-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="i440fx-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/fw_cfg-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="fw_cfg-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/drive_del-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="drive_del-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/wdt_ib700-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="wdt_ib700-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/tco-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="tco-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/e1000-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="e1000-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/e1000e-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="e1000e-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/rtl8139-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="rtl8139-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/pcnet-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="pcnet-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/eepro100-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="eepro100-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ne2000-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ne2000-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/nvme-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="nvme-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ac97-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ac97-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/es1370-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="es1370-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-net-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-net-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-balloon-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-balloon-test" || exit
$?; MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-blk-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-blk-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-rng-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-rng-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-scsi-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-scsi-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$((
${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-9p-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-9p-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-serial-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-serial-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/virtio-console-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="virtio-console-test" || exit
$?; MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/tpci200-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="tpci200-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ipoctal232-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ipoctal232-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/display-vga-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="display-vga-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/intel-hda-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="intel-hda-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ivshmem-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ivshmem-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/megasas-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="megasas-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/vmxnet3-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="vmxnet3-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/pvpanic-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="pvpanic-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/i82801b11-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="i82801b11-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/ioh3420-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="ioh3420-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/usb-hcd-ohci-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="usb-hcd-ohci-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/usb-hcd-uhci-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="usb-hcd-uhci-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/usb-hcd-xhci-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="usb-hcd-xhci-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/cpu-plug-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="cpu-plug-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/q35-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="q35-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/vmgenid-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="vmgenid-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/vhost-user-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="vhost-user-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img tests/tpm-crb-swtpm-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="tpm-crb-swtpm-test" || exit $?;
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 2fwrite():
Resource temporarily unavailable
make: Leaving directory '/home/petmay01/linaro/qemu-for-merges/build/clang'
make: write error: stdout
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18
2018-12-20 17:38 ` [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Peter Maydell
@ 2018-12-20 17:41 ` Peter Maydell
2018-12-20 18:55 ` Paolo Bonzini
0 siblings, 1 reply; 8+ messages in thread
From: Peter Maydell @ 2018-12-20 17:41 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 20 Dec 2018 at 17:38, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Thu, 20 Dec 2018 at 12:37, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > The following changes since commit e85c577158a2e8e252414959da9ef15c12eec63d:
> >
> > Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-12-17' into staging (2018-12-18 14:31:06 +0000)
> >
> > are available in the Git repository at:
> >
> > git://github.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to b4e8bbb9ae50045160957e7ab66c4f1cae535ea4:
> >
> > avoid TABs in files that only contain a few (2018-12-19 16:03:22 +0100)
> >
> > ----------------------------------------------------------------
> > * HAX support for Linux hosts (Alejandro)
> > * esp bugfixes (Guenter)
> > * Windows build cleanup (Marc-André)
> > * checkpatch logic improvements (Paolo)
> > * coalesced range bugfix (Paolo)
> > * switch testsuite to TAP (Paolo)
> > * QTAILQ rewrite (Paolo)
> > * block/iscsi.c cancellation fixes (Stefan)
> > * improve selection of the default accelerator (Thomas)
>
> This seemed to work on most of my test hosts but something
> weird happened here: hyperlong repetitive command line and
> looks like make got an "fwrite(): Resource temporarily unavailable"
> halfway through writing it out??
>
> This was on my x86-64 Linux Ubuntu system, clang build
> which I configure with '--cc=clang' '--cxx=clang++' '--enable-gtk'
> '--extra-cflags=-fsanitize=undefined -fno-sanitize=shift-base -Werror';
> the error is during the 'make -C build/clang check V=1' phase.
Checking my logfiles I think that the previous pull request
apply attempt also failed this way, but I didn't notice
because of the other failures on other hosts. It may be
the combination of the huge command line and the way my
test setup uses GNU parallel and ssh to capture the make
output into a logfile.
thanks
-- PMM
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18
2018-12-20 17:41 ` Peter Maydell
@ 2018-12-20 18:55 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-20 18:55 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 20/12/18 18:41, Peter Maydell wrote:
>> This seemed to work on most of my test hosts but something
>> weird happened here: hyperlong repetitive command line and
>> looks like make got an "fwrite(): Resource temporarily unavailable"
>> halfway through writing it out??
>>
>> This was on my x86-64 Linux Ubuntu system, clang build
>> which I configure with '--cc=clang' '--cxx=clang++' '--enable-gtk'
>> '--extra-cflags=-fsanitize=undefined -fno-sanitize=shift-base -Werror';
>> the error is during the 'make -C build/clang check V=1' phase.
>
> Checking my logfiles I think that the previous pull request
> apply attempt also failed this way, but I didn't notice
> because of the other failures on other hosts. It may be
> the combination of the huge command line and the way my
> test setup uses GNU parallel and ssh to capture the make
> output into a logfile.
Ok, I got it even better than the old harness. Now each test is printed
individually and the V=1 command lines are very easily cut-and-pasted:
TEST check-qtest-x86_64: tests/endianness-test
TEST check-qtest-x86_64: tests/fdc-test
TEST check-qtest-x86_64: tests/ide-test
TEST check-qtest-x86_64: tests/ahci-test
With V=1:
export MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img; tests/endianness-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="endianness-test"
PASS 1 endianness-test /x86_64/endianness/pc
PASS 2 endianness-test /x86_64/endianness/split/pc
PASS 3 endianness-test /x86_64/endianness/combine/pc
export MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=x86_64-softmmu/qemu-system-x86_64
QTEST_QEMU_IMG=qemu-img; tests/fdc-test -m=quick -k --tap |
./scripts/tap-driver.pl --test-name="fdc-test"
PASS 1 fdc-test /x86_64/fdc/cmos
PASS 2 fdc-test /x86_64/fdc/no_media_on_start
PASS 3 fdc-test /x86_64/fdc/read_without_media
...
(as long as you don't use -k). Thanks for the test.
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped
2018-12-21 12:36 [Qemu-devel] [PULL v4 00/35] Misc patches for 2018-12-21 Paolo Bonzini
@ 2018-12-21 12:36 ` Paolo Bonzini
0 siblings, 0 replies; 8+ messages in thread
From: Paolo Bonzini @ 2018-12-21 12:36 UTC (permalink / raw)
To: qemu-devel
Sometimes a test's main() function recognizes that the environment
does not support the test, and therefore exits. In this case, we
still should run g_test_run() so that a TAP harness will print the
test plan ("1..0") and the test will be marked as skipped.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1543513531-1151-2-git-send-email-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/cdrom-test.c | 2 +-
tests/ivshmem-test.c | 5 ++---
tests/migration-test.c | 8 ++++----
tests/test-crypto-pbkdf.c | 3 ++-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/cdrom-test.c b/tests/cdrom-test.c
index 9b43dc9..14bd981 100644
--- a/tests/cdrom-test.c
+++ b/tests/cdrom-test.c
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
if (exec_genisoimg(genisocheck)) {
/* genisoimage not available - so can't run tests */
- return 0;
+ return g_test_run();
}
ret = prepare_image(arch, isoimage);
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index 089e268..fe5eb30 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -492,7 +492,7 @@ int main(int argc, char **argv)
/* shm */
tmpshm = mktempshm(TMPSHMSIZE, &fd);
if (!tmpshm) {
- return 0;
+ goto out;
}
tmpshmem = mmap(0, TMPSHMSIZE, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
g_assert(tmpshmem != MAP_FAILED);
@@ -514,9 +514,8 @@ int main(int argc, char **argv)
}
}
+out:
ret = g_test_run();
-
cleanup();
-
return ret;
}
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 06ca506..8352612 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -789,7 +789,7 @@ int main(int argc, char **argv)
g_test_init(&argc, &argv, NULL);
if (!ufd_version_check()) {
- return 0;
+ return g_test_run();
}
/*
@@ -800,7 +800,7 @@ int main(int argc, char **argv)
if (g_str_equal(qtest_get_arch(), "ppc64") &&
access("/sys/module/kvm_hv", F_OK)) {
g_test_message("Skipping test: kvm_hv not available");
- return 0;
+ return g_test_run();
}
/*
@@ -811,11 +811,11 @@ int main(int argc, char **argv)
#if defined(HOST_S390X)
if (access("/dev/kvm", R_OK | W_OK)) {
g_test_message("Skipping test: kvm not available");
- return 0;
+ return g_test_run();
}
#else
g_test_message("Skipping test: Need s390x host to work properly");
- return 0;
+ return g_test_run();
#endif
}
diff --git a/tests/test-crypto-pbkdf.c b/tests/test-crypto-pbkdf.c
index d937aff..85ed1f9 100644
--- a/tests/test-crypto-pbkdf.c
+++ b/tests/test-crypto-pbkdf.c
@@ -440,6 +440,7 @@ int main(int argc, char **argv)
#else
int main(int argc, char **argv)
{
- return 0;
+ g_test_init(&argc, &argv, NULL);
+ return g_test_run();
}
#endif
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-12-21 12:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-20 12:36 [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Paolo Bonzini
2018-12-20 12:36 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-12-20 17:38 ` [Qemu-devel] [PULL v3 00/35] Misc patches for 2018-12-18 Peter Maydell
2018-12-20 17:41 ` Peter Maydell
2018-12-20 18:55 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2018-12-21 12:36 [Qemu-devel] [PULL v4 00/35] Misc patches for 2018-12-21 Paolo Bonzini
2018-12-21 12:36 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-12-19 15:18 [Qemu-devel] [PULL v2 00/35] Misc patches for 2018-12-18 Paolo Bonzini
2018-12-19 15:19 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
2018-12-17 23:16 [Qemu-devel] [PULL 00/35] Misc patches for 2018-12-18 Paolo Bonzini
2018-12-17 23:16 ` [Qemu-devel] [PULL 22/35] test: execute g_test_run when tests are skipped Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).