[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: gn: Enable tests.
From: |
guix-commits |
Subject: |
02/04: gnu: gn: Enable tests. |
Date: |
Fri, 15 Nov 2019 13:15:24 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 97b672d99fd8b017a6b069b1bf5e6bd4b8e61e8f
Author: Marius Bakke <address@hidden>
Date: Thu Nov 14 16:59:37 2019 +0100
gnu: gn: Enable tests.
* gnu/packages/build-tools.scm (gn)[arguments]: Remove #:tests?. Override
'check' phase.
---
gnu/packages/build-tools.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index b612cb9..5c11266 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -117,8 +117,7 @@ generate such a compilation database.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ;FIXME: How to run?
- #:phases (modify-phases %standard-phases
+ `(#:phases (modify-phases %standard-phases
(add-before 'configure 'set-build-environment
(lambda _
(setenv "CC" "gcc") (setenv "CXX" "g++")
@@ -142,6 +141,14 @@ generate such a compilation database.")
(lambda _
(invoke "ninja" "-C" "out" "gn"
"-j" (number->string (parallel-job-count)))))
+ (replace 'check
+ (lambda* (#:key (tests? #t) #:allow-other-keys)
+ (if tests?
+ (lambda ()
+ (invoke "ninja" "-C" "out" "gn_unittests"
+ "-j" (number->string
(parallel-job-count)))
+ (invoke "./out/gn_unittests"))
+ (format #t "test suite not run~%"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))