git.annexia.org
/
goaljobs-goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebuild OCaml 4.02.3 (RHBZ#1247418).
[goaljobs-goals.git]
/
config.ml
diff --git
a/config.ml
b/config.ml
index
11734d3
..
5fa42de
100644
(file)
--- a/
config.ml
+++ b/
config.ml
@@
-8,6
+8,12
@@
open Printf
(* General. *)
let buildtmp = sprintf "%s/tmp/builds" (Sys.getenv "HOME")
(* 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
(* libguestfs *)
let libguestfs_query_mins = 60
@@
-38,14
+44,23
@@
let libguestfs_localconfigure source =
" configure
let libguestfs_localenv supermin =
" configure
let libguestfs_localenv supermin =
+ let skips =
+ shlines "grep 'export 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
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) ->
match supermin with
| None -> ""
| Some (supermin, supermin_helper) ->