[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: tests: Add 'test-assertm' to (guix tests).
From: |
David Craven |
Subject: |
05/08: tests: Add 'test-assertm' to (guix tests). |
Date: |
Fri, 6 Jan 2017 11:16:03 +0000 (UTC) |
dvc pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit b80bba82dd60a9e8263fc6b7f9e9db4342f56a0d
Author: Ludovic Courtès <address@hidden>
Date: Sat Apr 4 21:59:25 2015 +0200
tests: Add 'test-assertm' to (guix tests).
* guix/tests.scm (test-assertm): New macro.
* tests/gexp.scm (test-assertm): Remove.
* tests/profiles.scm (test-assertm): Remove.
---
guix/tests.scm | 10 ++++++++++
tests/gexp.scm | 5 -----
tests/profiles.scm | 5 -----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/guix/tests.scm b/guix/tests.scm
index 5110075..278662e 100644
--- a/guix/tests.scm
+++ b/guix/tests.scm
@@ -26,6 +26,7 @@
#:use-module (guix build-system gnu)
#:use-module (gnu packages bootstrap)
#:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-64)
#:use-module (rnrs bytevectors)
#:use-module (ice-9 binary-ports)
#:use-module (web uri)
@@ -37,6 +38,7 @@
shebang-too-long?
mock
%test-substitute-urls
+ test-assertm
%substitute-directory
with-derivation-narinfo
with-derivation-substitute
@@ -126,6 +128,14 @@ given by REPLACEMENT."
(lambda () body ...)
(lambda () (module-set! m 'proc original)))))
+(define-syntax-rule (test-assertm name exp)
+ "Like 'test-assert', but EXP has a monadic value. A new connection to the
+store is opened."
+ (test-assert name
+ (with-store store
+ (run-with-store store exp
+ #:guile-for-build (%guile-for-build)))))
+
;;;
;;; Narinfo files, as used by the substituter.
diff --git a/tests/gexp.scm b/tests/gexp.scm
index baf7883..4b38472 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -60,11 +60,6 @@
#:target target)
#:guile-for-build (%guile-for-build)))
-(define-syntax-rule (test-assertm name exp)
- (test-assert name
- (run-with-store %store exp
- #:guile-for-build (%guile-for-build))))
-
(test-begin "gexp")
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 5536364..3e694a0 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -45,11 +45,6 @@
;; Globally disable grafts because they can trigger early builds.
(%graft? #f)
-(define-syntax-rule (test-assertm name exp)
- (test-assert name
- (run-with-store %store exp
- #:guile-for-build (%guile-for-build))))
-
;; Example manifest entries.
(define guile-1.8.8
- branch wip-build-systems-gexp created (now 58fee7f), David Craven, 2017/01/06
- 03/08: gexp: Micro-optimize sexp serialization., David Craven, 2017/01/06
- 05/08: tests: Add 'test-assertm' to (guix tests).,
David Craven <=
- 01/08: gnu: bootstrap: Move 'use-modules' forms to the beginning of build expressions., David Craven, 2017/01/06
- 04/08: monads: Micro-optimize 'foldm'., David Craven, 2017/01/06
- 06/08: packages: Turn 'bag->derivation' into a monadic procedure., David Craven, 2017/01/06
- 08/08: DRAFT gexp: Handle list conversion to <gexp-input> in the expanded code., David Craven, 2017/01/06
- 07/08: store: Add a functional object cache and use it in 'lower-object'., David Craven, 2017/01/06
- 02/08: build-system: Rewrite using gexps., David Craven, 2017/01/06