libnbd/0002-tests-Make-sure-errors-test-uses-serialized-nbdkit.patch
Richard W.M. Jones f001a4af3f Add all upstream patches since 0.9.6 was released.
Package the ocaml bindings into a subpackage.
2019-08-03 15:35:41 +01:00

33 lines
1.2 KiB
Diff

From 8eac86f4a53e6523c5c1693cca1f20f4d8034125 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 1 Aug 2019 05:51:54 -0500
Subject: [PATCH 02/11] tests: Make sure errors test uses serialized nbdkit
An upcoming nbdkit release will be relaxing sh scripts to be fully
parallel unless the script requests otherwise; but our errors test
depends on the current serialized execution. Thankfully, older nbdkit
does not care if we provide the new hook for the sake of newer nbdkit.
An audit for other testsuite use of nbdkit sh turns up
eflags-plugin.sh and meta-base-allocation.sh, but those will continue
to work in a parallel model.
---
tests/errors.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/errors.c b/tests/errors.c
index 4043c78..8a916fe 100644
--- a/tests/errors.c
+++ b/tests/errors.c
@@ -104,6 +104,7 @@ main (int argc, char *argv[])
if (dprintf (script_fd, "case $1 in\n"
" get_size) echo 128m || exit 1 ;;\n"
+ " thread_model) echo serialize_all_requests; exit 0 ;;\n"
" pread) printf 'ENOMEM ' >&2; exit 1 ;;\n"
" can_write) exit 0 ;;\n"
" pwrite)\n"
--
2.22.0