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

diff --git a/config.ml b/config.ml
index 999e9ea..25316f7 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,12 +45,16 @@ let libguestfs_localconfigure source =
   --enable-werror \\
   --enable-gtk-doc \\
   --disable-golang \\
+  --disable-erlang \\
   -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
@@ -79,6 +89,12 @@ 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
 " ^
     match supermin with
     | None -> ""