summaryrefslogtreecommitdiff
path: root/gnu/packages/virtualization.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-06-25 11:54:26 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-06-25 11:59:32 +0200
commitbd9eb3840a04f4e2e7ff471805cb6d97f448c746 (patch)
tree8b28007a2efcea283c24f88853f8e6bf3ff34403 /gnu/packages/virtualization.scm
parent1e623974b1a804fd653b390d1e03226c372f9feb (diff)
downloadguix-patches-bd9eb3840a04f4e2e7ff471805cb6d97f448c746.tar
guix-patches-bd9eb3840a04f4e2e7ff471805cb6d97f448c746.tar.gz
gnu: libvirt: Enable the test suite.
* gnu/packages/virtualization.scm (libvirt)[arguments]: Fix posix_spawn tests, specifically disable the remaining failing tests, and enable the rest of the test suite.
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r--gnu/packages/virtualization.scm27
1 files changed, 13 insertions, 14 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index e1af827bb9..bd6518e93b 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -409,28 +409,27 @@ manage system or application containers.")
"0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"))))
(build-system gnu-build-system)
(arguments
- `(;; FAIL: virshtest
- ;; FAIL: virfirewalltest
- ;; FAIL: virkmodtest
- ;; FAIL: virnetsockettest
- ;; FAIL: networkxml2firewalltest
- ;; FAIL: nwfilterebiptablestest
- ;; FAIL: nwfilterxml2firewalltest
- ;; Time-out while running commandtest.
- #:tests? #f
- #:configure-flags
+ `(#:configure-flags
(list "--with-polkit"
"--sysconfdir=/etc"
"--localstatedir=/var")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'fix-tests
+ (add-before 'configure 'fix-BOURNE_SHELL-definition
+ ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures.
(lambda _
- (substitute* '("tests/commandtest.c"
- "gnulib/tests/test-posix_spawn1.c"
- "gnulib/tests/test-posix_spawn2.c")
+ (substitute* "config.h.in"
(("/bin/sh") (which "sh")))
#t))
+ (add-before 'configure 'disable-broken-tests
+ (lambda _
+ (let ((tests (list "commandtest" ; hangs idly
+ "virnetsockettest" ; tries to network
+ "virshtest"))) ; fails
+ (substitute* "tests/Makefile.in"
+ (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|")))
+ ""))
+ #t)))
(replace 'install
;; Since the sysconfdir and localstatedir should be /etc and /var
;; at runtime, we must prevent writing to them at installation