From 31317e5d7c249ed318398451ab36d81b0eb5095f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 27 Oct 2021 20:20:31 +0100
Subject: [PATCH] tests: vddk: Cannot test real VDDK under valgrind

The LD_LIBRARY_PATH munging done in nbdkit-vddk-plugin is incompatible
with valgrind, so skip it for both of the real VDDK tests.  This is
already done in the dummy VDDK tests.

(cherry picked from commit d501b5266c3239b974b79fd6a74ad046729cd046)
---
 tests/test-vddk-real-dump-plugin.sh | 7 +++++++
 tests/test-vddk-real.sh             | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/tests/test-vddk-real-dump-plugin.sh b/tests/test-vddk-real-dump-plugin.sh
index 1479e416..2cb7724e 100755
--- a/tests/test-vddk-real-dump-plugin.sh
+++ b/tests/test-vddk-real-dump-plugin.sh
@@ -39,6 +39,13 @@ requires test -d "$vddkdir"
 requires test -f "$vddkdir/lib64/libvixDiskLib.so"
 requires cut --version
 
+# Testing $LD_LIBRARY_PATH stuff breaks valgrind, so skip the rest of
+# this test if valgrinding.
+if [ "x$NBDKIT_VALGRIND" = "x1" ]; then
+    echo "$0: skipped LD_LIBRARY_PATH test when doing valgrind"
+    exit 77
+fi
+
 # VDDK > 5.1.1 only supports x86_64.
 if [ `uname -m` != "x86_64" ]; then
     echo "$0: unsupported architecture"
diff --git a/tests/test-vddk-real.sh b/tests/test-vddk-real.sh
index 08f6f8d8..e7007bfa 100755
--- a/tests/test-vddk-real.sh
+++ b/tests/test-vddk-real.sh
@@ -45,6 +45,13 @@ requires nbdcopy --version
 requires nbdinfo --version
 requires stat --version
 
+# Testing $LD_LIBRARY_PATH stuff breaks valgrind, so skip the rest of
+# this test if valgrinding.
+if [ "x$NBDKIT_VALGRIND" = "x1" ]; then
+    echo "$0: skipped LD_LIBRARY_PATH test when doing valgrind"
+    exit 77
+fi
+
 # VDDK > 5.1.1 only supports x86_64.
 if [ `uname -m` != "x86_64" ]; then
     echo "$0: unsupported architecture"
-- 
2.31.1