X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=1b3b84018a5b0e44c0760d1232142a4eadd7be38;hb=23a6cb44e5a7c0afb4f7d02db885ab626165d8f2;hp=5fa42de8d882d197e62026f2c3ce8e55bb2e71ed;hpb=5ef65f7d418d25974089a8cb19715221a2d52f68;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index 5fa42de..1b3b840 100644
--- a/config.ml
+++ b/config.ml
@@ -17,8 +17,14 @@ let fedora_specfile pkg branch =
 (* libguestfs *)
 let libguestfs_query_mins = 60
 
+let websites_repo =
+  sprintf "%s/d/websites" (Sys.getenv "HOME")
 let libguestfs_website_repo =
-  sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
+  sprintf "%s/libguestfs" websites_repo
+let libguestfs_builder_repo =
+  sprintf "%s/libguestfs-builder" websites_repo
+let libguestfs_download_repo =
+  sprintf "%s/libguestfs-download" websites_repo
 
 let libguestfs_localconfigure source =
   let configure =
@@ -29,8 +35,8 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
-# NB: --enable-valgrind-daemon is disabled because we
-# should be checking production builds.
+# erlang is disabled because it is broken in Rawhide:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1316206
 
 %s \\
   --prefix /usr \\
@@ -39,16 +45,16 @@ let libguestfs_localconfigure source =
   --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
+  --disable-erlang \\
   -C \\
   \"$@\"
 " configure
 
 let libguestfs_localenv supermin =
-  let skips =
-    shlines "grep 'export SKIP_' %s"
-            (fedora_specfile "libguestfs" "master") in
-
   "\
+# Use the real virt-builder configuration from /etc.
+export XDG_CONFIG_DIRS=/etc
+
 # 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
@@ -60,7 +66,50 @@ 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
+
+# libguestfs: error: mkfs_btrfs: /dev/sda1: not enough free space
+# (RHBZ#1291715).
+export SKIP_TEST_BTRFS_IMAGE_0=1
+
+# Yawn, btrfs broken again. RHBZ#1372037
+export SKIP_TEST_BTRFS_DEVICES_SH=1
+
+# Kernel takes lots of RAM for virtio-scsi RHBZ#1478201
+export SKIP_TEST_255_DISKS_SH=1
+export SKIP_TEST_ADD_LOTS_OF_DISKS_SH=1
+
+# virtio-9p modules don't all get loaded RHBZ#1499896
+export SKIP_TEST_9P_SH=1
+
+# These tests are broken by libvirt not supporting qemu >= 2.10 locking.
+# REMOVE THIS when fixed.
+export SKIP_TEST820RHBZ912499_PY=1
+
+# ntfsclone is broken in Rawhide (RHBZ#1601146).
+export SKIP_TEST_NTFSCLONE_SH=1
+" ^
     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->