summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-15 22:47:55 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-15 23:01:56 +0100
commitebf5ad46db38fdf683b1b474faf610f4de2f65f9 (patch)
tree790476cb80ce56b40d5f1fd0a41476634d1dfb8e
parent6cb89466ba14ff899d0d446526c0f938536c31dc (diff)
downloadpatches-ebf5ad46db38fdf683b1b474faf610f4de2f65f9.tar
patches-ebf5ad46db38fdf683b1b474faf610f4de2f65f9.tar.gz
tests: Use 'test-assertm' for profiles.
* tests/profiles.scm (test-assertm): New macro. ("profile-derivation"): Use it instead of 'test-assert' + 'run-with-store'.
-rw-r--r--tests/profiles.scm30
1 files changed, 17 insertions, 13 deletions
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 61c801c351..d816248994 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -35,6 +35,11 @@
(define %store
(open-connection-for-tests))
+(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
@@ -156,19 +161,18 @@
(equal? (list glibc) install)
(equal? (list (cons guile-1.8.8 guile-2.0.9)) upgrade)))))
-(test-assert "profile-derivation"
- (run-with-store %store
- (mlet* %store-monad
- ((entry -> (package->manifest-entry %bootstrap-guile))
- (guile (package->derivation %bootstrap-guile))
- (drv (profile-derivation (manifest (list entry))
- #:info-dir? #f))
- (profile -> (derivation->output-path drv))
- (bindir -> (string-append profile "/bin"))
- (_ (built-derivations (list drv))))
- (return (and (file-exists? (string-append bindir "/guile"))
- (string=? (dirname (readlink bindir))
- (derivation->output-path guile)))))))
+(test-assertm "profile-derivation"
+ (mlet* %store-monad
+ ((entry -> (package->manifest-entry %bootstrap-guile))
+ (guile (package->derivation %bootstrap-guile))
+ (drv (profile-derivation (manifest (list entry))
+ #:info-dir? #f))
+ (profile -> (derivation->output-path drv))
+ (bindir -> (string-append profile "/bin"))
+ (_ (built-derivations (list drv))))
+ (return (and (file-exists? (string-append bindir "/guile"))
+ (string=? (dirname (readlink bindir))
+ (derivation->output-path guile))))))
(test-end "profiles")