Rebuild OCaml 4.07.0 (final).

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index dddf5a5..2d4884b 100644 (file)
--- 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 =
@@ -46,6 +52,9 @@ let libguestfs_localconfigure source =
 
 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
@@ -83,6 +92,20 @@ 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
 " ^
     match supermin with
     | None -> ""