From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 2 Mar 2015 13:30:47 +0000 (+0000)
Subject: libguestfs: Don't hard-code SKIP_* variables.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=29fdc96f3f104cc1d11bf819f19bc978ef0eae87;p=goaljobs-goals.git

libguestfs: Don't hard-code SKIP_* variables.

Pull them out of the spec file instead.
---

diff --git a/config.ml b/config.ml
index e5550e4..e3d26b7 100644
--- a/config.ml
+++ b/config.ml
@@ -44,14 +44,10 @@ let libguestfs_localconfigure source =
 " configure
 
 let libguestfs_localenv supermin =
-  "\
-# Parallel test runs out of resources starting qemu, unclear why.
-export SKIP_TEST_PARALLEL_MOUNT_LOCAL=1
+  let skips =
+    shlines "grep SKIP_ %s" (fedora_specfile "libguestfs" "master") in
 
-# 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) ->