From c472b47a55a331dcb5cc75def71cc665abbc06db Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 24 Oct 2019 14:36:54 +0100 Subject: [PATCH] vddk: Disable tests on non-x86 platforms. Fixes commit a0184ba081164218ddd1928ed48a75fca93406bc. --- tests/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 558ea86..2db5e7b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -162,12 +162,14 @@ check-valgrind: check-root: $(MAKE) check TESTS="test-file-block" +if HAVE_VDDK # Run a basic check against a real copy of VDDK. You must set # vddkdir to point to the library location, eg: # # make check-vddk vddkdir=vmware-vix-disklib-distrib check-vddk: $(MAKE) check TESTS=test-vddk-real.sh +endif HAVE_VDDK #---------------------------------------------------------------------- # Basic server command line and start-up tests. @@ -713,6 +715,7 @@ test_streaming_SOURCES = test-streaming.c test.h test_streaming_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS) test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) +if HAVE_VDDK # VDDK plugin test. # This only tests that the plugin can be loaded against a # dummy VDDK library, it is not a detailed test. @@ -737,6 +740,7 @@ libvixDiskLib_la_CXXFLAGS = $(WARNINGS_CFLAGS) libvixDiskLib_la_LDFLAGS = \ -shared -version-number 6:0:0 -rpath /nowhere \ $(NULL) +endif HAVE_VDDK # zero plugin test. TESTS += test-zero.sh -- 2.23.0