On 01/27/2018 05:41 AM, Richard W.M. Jones wrote:
This is for consistency with qemu-img, socat, ss, etc where we test
for these binaries at run time.
---
+++ b/tests/Makefile.am
@@ -178,11 +178,9 @@ file-data:
# While most tests need libguestfs, testing parallel I/O is easier when
# using qemu-io to kick off asynchronous requests.
Is this comment still necessary, given that...
-if HAVE_QEMU_IO
-TESTS_ENVIRONMENT += QEMU_IO=$(QEMU_IO)
-TESTS += test-parallel-file.sh
-TESTS += test-parallel-nbd.sh
-endif HAVE_QEMU_IO
+TESTS += \
+ test-parallel-file.sh \
+ test-parallel-nbd.sh
...you are removing the conditional?
+++ b/tests/test-parallel-file.sh
@@ -31,14 +31,19 @@
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-# Makefile sets $QEMU_IO and builds file-data, but it's also nice if the
-# script runs again standalone afterwards for diagnosing any failures
-test -f file-data || { echo "Missing file-data"; exit 77; }
-: ${QEMU_IO=qemu-io}
This still makes sense for user overrides, even if configure.ac/Makefile
doesn't set it.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization:
qemu.org |
libvirt.org