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
Use installed goaljobs package.
[goaljobs-goals.git]
/
config.ml
diff --git
a/config.ml
b/config.ml
index
e6d5e3c
..
d33bb58
100644
(file)
--- a/
config.ml
+++ b/
config.ml
@@
-29,8
+29,8
@@
let libguestfs_localconfigure source =
#!/bin/bash -
. localenv
#!/bin/bash -
. localenv
-#
NB: --enable-valgrind-daemon is disabled because we
-#
should be checking production builds.
+#
erlang is disabled because it is broken in Rawhide:
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1316206
%s \\
--prefix /usr \\
%s \\
--prefix /usr \\
@@
-39,12
+39,16
@@
let libguestfs_localconfigure source =
--enable-werror \\
--enable-gtk-doc \\
--disable-golang \\
--enable-werror \\
--enable-gtk-doc \\
--disable-golang \\
+ --disable-erlang \\
-C \\
\"$@\"
" configure
let libguestfs_localenv supermin =
"\
-C \\
\"$@\"
" configure
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 of a leak in the fuse library,
# although I could not work out exactly why.
export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
@@
-76,6
+80,12
@@
export SKIP_TEST_XFS_MISC_PL=1
# syslinux broken by mtools (RHBZ#1275087).
export SKIP_TEST_SYSLINUX_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
" ^
match supermin with
| None -> ""
" ^
match supermin with
| None -> ""