[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
78/104: gnu: multipath-tools: Enable tests.
From: |
guix-commits |
Subject: |
78/104: gnu: multipath-tools: Enable tests. |
Date: |
Sun, 17 May 2020 11:36:46 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit bc0e5133ae61b34439355d47119dcc9ff3332937
Author: Marius Bakke <address@hidden>
AuthorDate: Sat May 16 20:56:20 2020 +0200
gnu: multipath-tools: Enable tests.
* gnu/packages/linux.scm (multipath-tools)[arguments]: Remove #:tests?. Add
#:test-target. Add phase to add missing linker flag.
[native-inputs]: Add CMOCKA.
---
gnu/packages/linux.scm | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2d8acea..aa52068 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4205,7 +4205,7 @@ arrays when needed.")
#t))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ; no tests
+ '(#:test-target "test"
#:parallel-build? #f ;XXX: broken in 0.8.4
#:make-flags (list "CC=gcc"
(string-append "DESTDIR="
@@ -4242,11 +4242,22 @@ arrays when needed.")
(("bool is_queueing;")
"bool is_queueing = false;"))
#t))
+ (add-after 'unpack 'fix-linking-tests
+ (lambda _
+ ;; Add missing linker flag for -lmpathcmd. This should be fixed
+ ;; for versions > 0.8.4.
+ (substitute* "tests/Makefile"
+ (("-lmultipath -lcmocka")
+ "-lmultipath -L$(mpathcmddir) -lmpathcmd -lcmocka"))
+ #t))
(delete 'configure)))) ; no configure script
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
- ("valgrind" ,valgrind)))
+ ("valgrind" ,valgrind)
+
+ ;; For tests.
+ ("cmocka" ,cmocka)))
(inputs
`(("json-c" ,json-c)
("libaio" ,libaio)
- 68/104: doc: Reword "The GCC toolchain"., (continued)
- 68/104: doc: Reword "The GCC toolchain"., guix-commits, 2020/05/17
- 69/104: gnu: openctm: Correct inputs vs native-inputs, guix-commits, 2020/05/17
- 70/104: gnu: Add lib3ds., guix-commits, 2020/05/17
- 73/104: gnu: xdot: Fix typo in description., guix-commits, 2020/05/17
- 75/104: gnu: multipath-tools: Update to 0.8.4., guix-commits, 2020/05/17
- 72/104: gnu: tinyxml2: Update to 8.0.0., guix-commits, 2020/05/17
- 66/104: gnu: Add font-api-mj-mincho., guix-commits, 2020/05/17
- 74/104: gnu: multipath-tools: Fetch with git., guix-commits, 2020/05/17
- 76/104: gnu: gajim: Adapt search path for Python 3.8., guix-commits, 2020/05/17
- 77/104: gnu: heimdal: Update to 7.7.0., guix-commits, 2020/05/17
- 78/104: gnu: multipath-tools: Enable tests.,
guix-commits <=
- 81/104: gnu: drumkv1: Update to 0.9.14., guix-commits, 2020/05/17
- 83/104: gnu: padthv1: Update to 0.9.14., guix-commits, 2020/05/17
- 88/104: gnu: julius: Remove unused bundled libraries., guix-commits, 2020/05/17
- 79/104: gnu: guile-hall: Update to 0.3.1., guix-commits, 2020/05/17
- 82/104: gnu: samplv1: Update to 0.9.14., guix-commits, 2020/05/17
- 92/104: gnu: alpine: Support cross-gcc'ing., guix-commits, 2020/05/17
- 93/104: gnu: soundconverter: Update to 3.0.2., guix-commits, 2020/05/17
- 84/104: gnu: supertux: Update to 0.6.2., guix-commits, 2020/05/17
- 86/104: gnu: mumble: End phase with #t., guix-commits, 2020/05/17
- 89/104: gnu: java-xz: Remove duplicate definition., guix-commits, 2020/05/17