Move SKIP_* variables here.

No longer kept in the spec file, since we test on installed now.

diff --git a/config.ml b/config.ml
index 5fa42de..ffac911 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -44,10 +44,6 @@ let libguestfs_localconfigure source =
 " configure
 
 let libguestfs_localenv supermin =
 " configure
 
 let libguestfs_localenv supermin =

-  let skips =
-    shlines "grep 'export SKIP_' %s"
-            (fedora_specfile "libguestfs" "master") in
-

   "\
 # Fails under valgrind because of a leak in the fuse library,
 # although I could not work out exactly why.
   "\
 # Fails under valgrind because of a leak in the fuse library,
 # although I could not work out exactly why.


@@ -60,7 +56,24 @@ export SKIP_TEST_FILE_ARCHITECTURE_15=1
 # Fails under valgrind because xzcat subprocess has a memory leak.
 export SKIP_TEST_FILE_ARCHITECTURE_17=1
 
 # Fails under valgrind because xzcat subprocess has a memory leak.
 export SKIP_TEST_FILE_ARCHITECTURE_17=1
 

-" ^ String.concat "\n" skips ^
+# This test fails because we build the ISO after encoding the checksum
+# of the ISO in the test itself.  Need to fix the test to work out the
+# checksum at runtime.
+export SKIP_TEST_CHECKSUM_DEVICE=1
+
+# Disable parallel virt-alignment-scan & virt-df tests (RHBZ#1025942).
+export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
+export SKIP_TEST_VIRT_DF_GUESTS_SH=1
+
+# fusermount behaviour seems to have broken the test (RHBZ#1220751).
+export SKIP_TEST_FUSE_UMOUNT_RACE_SH=1
+export SKIP_TEST_GUESTMOUNT_FD=1
+
+# xfs_admin has no effect in Rawhide (RHBZ#1233220).
+export SKIP_TEST_XFS_ADMIN=1
+export SKIP_TEST_XFS_MISC_PL=1
+
+" ^

     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->
     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->