X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=e6d5e3c5c6b0f9321a47379c23c96eb9743f9d01;hb=e9c34d60d744b25170f82c60cd300a67711a971f;hp=e3d26b737279a432b6eaad2b12d07d6428efd1f8;hpb=29fdc96f3f104cc1d11bf819f19bc978ef0eae87;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index e3d26b7..e6d5e3c 100644
--- a/config.ml
+++ b/config.ml
@@ -44,10 +44,39 @@ let libguestfs_localconfigure source =
 " configure
 
 let libguestfs_localenv supermin =
-  let skips =
-    shlines "grep 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.
+export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
 
-  String.concat "\n" skips  ^
+# 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
+
+# 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
+
+" ^
     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->