Make F22 and F23 follow 1.30

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index 251bfa8..5fa42de 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -8,11 +8,17 @@ 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_query_mins = 5
+let libguestfs_query_mins = 60
 
-let libguestfs_website_cvs =
-  sprintf "%s/d/redhat/websites/libguestfs" (Sys.getenv "HOME")
+let libguestfs_website_repo =
+  sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
 
 let libguestfs_localconfigure source =
   let configure =
@@ -23,21 +29,44 @@ let libguestfs_localconfigure source =
 #!/bin/bash -
 . localenv
 
+# NB: --enable-valgrind-daemon is disabled because we
+# should be checking production builds.
+
 %s \\
   --prefix /usr \\
   --disable-static \\
   --with-default-backend=libvirt \\
-  --enable-gcc-warnings \\
+  --enable-werror \\
   --enable-gtk-doc \\
-  --enable-valgrind-daemon \\
+  --disable-golang \\
   -C \\
   \"$@\"
 " configure
 
-let libguestfs_localenv = "\
-# Parallel test runs out of resources starting qemu, unclear why.
+let libguestfs_localenv supermin =
+  let skips =
+    shlines "grep 'export SKIP_' %s"
+            (fedora_specfile "libguestfs" "master") in
+
+  "\
+# 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
+
+" ^ String.concat "\n" skips ^
+    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