X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=999e9eaeaed1dbcccb423791b175f8a8ad95fe8e;hb=9220c617d6f522591fff56fab258cd5a0d5292ae;hp=5fa42de8d882d197e62026f2c3ce8e55bb2e71ed;hpb=5ef65f7d418d25974089a8cb19715221a2d52f68;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index 5fa42de..999e9ea 100644
--- a/config.ml
+++ b/config.ml
@@ -44,10 +44,6 @@ let libguestfs_localconfigure source =
 " 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.
@@ -60,7 +56,30 @@ 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 ^
+# 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
+
+# syslinux broken by mtools (RHBZ#1275087).
+export SKIP_TEST_SYSLINUX_PL=1
+
+# See https://www.redhat.com/archives/libguestfs/2015-November/msg00144.html
+export SKIP_TEST_INOTIFY_ADD_WATCH=1
+
+" ^
     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->