libguestfs: Make SKIP_* variables more robust.

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index 50ff28f..5fa42de 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -45,7 +45,8 @@ let libguestfs_localconfigure source =
 
 let libguestfs_localenv supermin =
   let skips =
-    shlines "grep SKIP_ %s" (fedora_specfile "libguestfs" "master") in
+    shlines "grep 'export SKIP_' %s"
+            (fedora_specfile "libguestfs" "master") in
 
   "\
 # Fails under valgrind because of a leak in the fuse library,
@@ -54,6 +55,10 @@ export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
 
 # Fails under valgrind because cpio subprocess has a memory leak.
 export SKIP_TEST_FILE_ARCHITECTURE_11=1
+export SKIP_TEST_FILE_ARCHITECTURE_15=1
+
+# Fails under valgrind because xzcat subprocess has a memory leak.
+export SKIP_TEST_FILE_ARCHITECTURE_17=1
 
 " ^ String.concat "\n" skips ^
     match supermin with