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

diff --git a/config.ml b/config.ml
index e6d5e3c..f0a5dea 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,22 +35,26 @@ 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 \\
   --disable-static \\
   --with-default-backend=libvirt \\
-  --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
+  --disable-erlang \\
+  --with-virt-v2v-nbdkit-python-plugin=python3 \\
   -C \\
   \"$@\"
 " configure
 
 let libguestfs_localenv supermin =
   "\
+# 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
@@ -76,6 +86,37 @@ 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
+
+# Kernel broken.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1657200
+export SKIP_TEST_BIG_DIRS_PL=1
+
+# Setting hostname on Ubuntu 18.04 is broken.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1658307
+export SKIP_TEST_SETTINGS_UBUNTU_18_04_SH=1
 " ^
     match supermin with
     | None -> ""