diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-08-23 19:18:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-08-23 22:33:04 +0200 |
| commit | c1bc358f293b97c9575f6195c3e7a119b05199ce (patch) | |
| tree | 2e75aafa414fe066598ca4f9f1b1b7eb4250c238 /tests/builders.scm | |
| parent | 90a063f4ca4e538df669103a7ffdd211e45f63d6 (diff) | |
| download | patches-c1bc358f293b97c9575f6195c3e7a119b05199ce.tar patches-c1bc358f293b97c9575f6195c3e7a119b05199ce.tar.gz | |
Factorize test suite support in (guix tests).
* guix/tests.scm: New file.
* Makefile.am (noinst_DATA): New variable.
(GOBJECTS): Add guix/tests.go.
* tests/builders.scm (%store): Use 'open-connection-for-tests'
from (guix tests).
* tests/derivations.scm: Likewise.
* tests/monads.scm: Likewise.
* tests/packages.scm: Likewise.
* tests/profiles.scm: Likewise.
* tests/union.scm: Likewise.
* tests/gexp.scm: Likewise.
(guile-for-build): Remove. Use (%guile-for-build) instead.
* tests/nar.scm (make-random-bytevector, %seed, random-text): Remove.
(populate-file): Change 'make-random-bytevector' to 'random-bytevector'.
Use (guix tests).
* tests/store.scm (%seed, random-text): Remove.
Use (guix tests).
Diffstat (limited to 'tests/builders.scm')
| -rw-r--r-- | tests/builders.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/builders.scm b/tests/builders.scm index 0ed5d74a22..54cdeb6d7b 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +25,7 @@ #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix derivations) + #:use-module (guix tests) #:use-module ((guix packages) #:select (package-derivation package-native-search-paths)) #:use-module (gnu packages bootstrap) @@ -35,11 +36,7 @@ ;; Test the higher-level builders. (define %store - (false-if-exception (open-connection))) - -(when %store - ;; Make sure we build everything by ourselves. - (set-build-options %store #:use-substitutes? #f)) + (open-connection-for-tests)) (define %bootstrap-inputs ;; Use the bootstrap inputs so it doesn't take ages to run these tests. |