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
libguestfs_fedora: Change memory key to include branch name.
[goaljobs-goals.git]
/
config.ml
diff --git
a/config.ml
b/config.ml
index
aaf536c
..
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")
(* 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
@@
-30,21
+36,26
@@
let libguestfs_localconfigure source =
--prefix /usr \\
--disable-static \\
--with-default-backend=libvirt \\
--prefix /usr \\
--disable-static \\
--with-default-backend=libvirt \\
- --enable-
gcc-warnings
\\
+ --enable-
werror
\\
--enable-gtk-doc \\
--enable-gtk-doc \\
+ --disable-golang \\
-C \\
\"$@\"
" configure
let libguestfs_localenv supermin =
-C \\
\"$@\"
" 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
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) ->
match supermin with
| None -> ""
| Some (supermin, supermin_helper) ->