Reverse the order of Fedora builds so we build Rawhide first.

[goaljobs-goals.git] / config.ml

diff --git a/config.ml b/config.ml
index 11734d3..50ff28f 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -8,6 +8,12 @@ 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 = 60
 
@@ -38,14 +44,18 @@ let libguestfs_localconfigure source =
 " configure
 
 let libguestfs_localenv supermin =
+  let skips =
+    shlines "grep SKIP_ %s" (fedora_specfile "libguestfs" "master") in
+
   "\
-# Parallel test runs out of resources starting qemu, unclear why.
+# 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
 
-" ^
+" ^ String.concat "\n" skips ^
     match supermin with
     | None -> ""
     | Some (supermin, supermin_helper) ->