From 02c220a6f189de0d901f16a2f09778c47aeff3ea Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 23 Sep 2014 12:47:40 +0100
Subject: [PATCH] v2v: Disable valgrind tests that are confused by -o rhev
 forking.

This updates commit 0dfa96c043cee4ce82c0a45c3ad09b0a61798b79.
---
 v2v/test-v2v-no-copy.sh | 4 +++-
 v2v/test-v2v-o-rhev.sh  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/v2v/test-v2v-no-copy.sh b/v2v/test-v2v-no-copy.sh
index 35177c947..f0408dca6 100755
--- a/v2v/test-v2v-no-copy.sh
+++ b/v2v/test-v2v-no-copy.sh
@@ -68,7 +68,9 @@ mkdir $d/12345678-1234-1234-1234-123456789abc/images
 mkdir $d/12345678-1234-1234-1234-123456789abc/master
 mkdir $d/12345678-1234-1234-1234-123456789abc/master/vms
 
-$VG virt-v2v --debug-gc --no-copy \
+# $VG - XXX Disabled because the forking used to write files in -o rhev
+# mode confuses valgrind.
+virt-v2v --debug-gc --no-copy \
     -i libvirt -ic "$libvirt_uri" windows \
     -o rhev -os $d
 
diff --git a/v2v/test-v2v-o-rhev.sh b/v2v/test-v2v-o-rhev.sh
index 6d2132080..1162e318a 100755
--- a/v2v/test-v2v-o-rhev.sh
+++ b/v2v/test-v2v-o-rhev.sh
@@ -57,7 +57,9 @@ mkdir $d/12345678-1234-1234-1234-123456789abc/images
 mkdir $d/12345678-1234-1234-1234-123456789abc/master
 mkdir $d/12345678-1234-1234-1234-123456789abc/master/vms
 
-$VG virt-v2v --debug-gc \
+# $VG - XXX Disabled because the forking used to write files in -o rhev
+# mode confuses valgrind.
+virt-v2v --debug-gc \
     -i libvirt -ic "$libvirt_uri" windows \
     -o rhev -os $d