From ebf5ad46db38fdf683b1b474faf610f4de2f65f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 15 Dec 2014 22:47:55 +0100 Subject: tests: Use 'test-assertm' for profiles. * tests/profiles.scm (test-assertm): New macro. ("profile-derivation"): Use it instead of 'test-assert' + 'run-with-store'. --- tests/profiles.scm | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'tests') 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") -- cgit v1.2.3