X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=config.ml;h=2d4884b2e9164ab720d5ff144150a3bd31d6cf3c;hb=d40720e98e861cab0803f52f11abf68298973ca9;hp=6db20f5bce81d197c0ca0207dc7288f8a5c36617;hpb=50790d6953d8bc68fd373f1c09949f7bff385050;p=goaljobs-goals.git

diff --git a/config.ml b/config.ml
index 6db20f5..2d4884b 100644
--- a/config.ml
+++ b/config.ml
@@ -8,9 +8,23 @@ open Printf
 (* General. *)
 let buildtmp = sprintf "%s/tmp/builds" (Sys.getenv "HOME")
 
+(* Fedora *)
+let fedora_dir = Sys.getenv "HOME" // "d/fedora"
+let fedora_repo pkg branch = fedora_dir // pkg // branch
+let fedora_specfile pkg branch =
+  sprintf "%s/%s.spec" (fedora_repo pkg branch) pkg
+
 (* libguestfs *)
-let libguestfs_website_cvs =
-  sprintf "%s/d/redhat/websites/libguestfs" (Sys.getenv "HOME")
+let libguestfs_query_mins = 60
+
+let websites_repo =
+  sprintf "%s/d/websites" (Sys.getenv "HOME")
+let libguestfs_website_repo =
+  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 =
@@ -21,21 +35,84 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
+# 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-gcc-warnings \\
+  --enable-werror \\
   --enable-gtk-doc \\
-  --enable-valgrind-daemon \\
+  --disable-golang \\
+  --disable-erlang \\
   -C \\
   \"$@\"
 " configure
 
-let libguestfs_localenv = "\
-# Parallel test runs out of resources starting qemu, unclear why.
+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
 
 # 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
+
+# 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
+" ^
+    match supermin with
+    | None -> ""
+    | Some (supermin, supermin_helper) ->
+      sprintf "\
+# Needs a modified path to supermin binaries:
+export SUPERMIN=%s
+export SUPERMIN_HELPER=%s
+
+" supermin supermin_helper