[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
42/63: tests: base: Correct invalid merge.
From: |
Mark H. Weaver |
Subject: |
42/63: tests: base: Correct invalid merge. |
Date: |
Thu, 4 Aug 2016 07:44:57 +0000 (UTC) |
mhw pushed a commit to branch core-updates-2016-08-01
in repository guix.
commit 716753cb9768dde6494b4bd2895f2186c31c0e34
Author: Ludovic Courtès <address@hidden>
Date: Sat Jul 30 01:07:50 2016 +0200
tests: base: Correct invalid merge.
Fixes a regression introduced by merge commit
7575655212ecfbcd1f04e429c8a7a41f8720d027.
* gnu/tests/base.scm (run-basic-test)[test]: Fix list of 'use-modules'
and 'test-begin' call.
---
gnu/tests/base.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 479403e..a6278b2 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -73,6 +73,8 @@ properties of running system to what's declared in OS, an
<operating-system>."
(with-imported-modules '((gnu build marionette))
#~(begin
(use-modules (gnu build marionette)
+ (srfi srfi-1)
+ (srfi srfi-26)
(srfi srfi-64)
(ice-9 match))
@@ -82,7 +84,7 @@ properties of running system to what's declared in OS, an
<operating-system>."
(mkdir #$output)
(chdir #$output)
- (test-begin "mcron")
+ (test-begin "basic")
(test-assert "uname"
(match (marionette-eval '(uname) marionette)
- 02/63: Merge branch 'master' into core-updates, (continued)
- 02/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 60/63: gnu: texlive-texmf: Mark as non-substitutable., Mark H. Weaver, 2016/08/04
- 52/63: gnu: fastcap: Add input ghostscript., Mark H. Weaver, 2016/08/04
- 58/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 48/63: gnu: dealii: Update to 8.4.1., Mark H. Weaver, 2016/08/04
- 26/63: gnu: r-genomicalignments: Update to 1.8.4., Mark H. Weaver, 2016/08/04
- 29/63: gnu: r-biocparallel: Update to 1.6.3., Mark H. Weaver, 2016/08/04
- 30/63: gnu: r-annotationdbi: Update to 1.34.4., Mark H. Weaver, 2016/08/04
- 32/63: gnu: r-xvector: Update to 0.12.1., Mark H. Weaver, 2016/08/04
- 22/63: gnu: r-s4vectors: Update to 0.10.2., Mark H. Weaver, 2016/08/04
- 42/63: tests: base: Correct invalid merge.,
Mark H. Weaver <=
- 36/63: gnu: vlc: Drop -ffast-math from the compilation flags., Mark H. Weaver, 2016/08/04
- 54/63: download: Pass the raw file name to content-addressed mirrors., Mark H. Weaver, 2016/08/04
- 51/63: gnu: zsh: Update to 5.2., Mark H. Weaver, 2016/08/04
- 38/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 04/63: Merge branch 'master' into core-updates, Mark H. Weaver, 2016/08/04
- 27/63: gnu: r-summarizedexperiment: Update to 1.2.3., Mark H. Weaver, 2016/08/04
- 10/63: Merge remote-tracking branch 'origin/master' into core-updates, Mark H. Weaver, 2016/08/04
- 25/63: gnu: r-rtracklayer: Update to 1.32.2., Mark H. Weaver, 2016/08/04
- 34/63: gnu: r-iranges: Update to 2.6.1., Mark H. Weaver, 2016/08/04
- 33/63: gnu: r-limma: Update to 3.28.17., Mark H. Weaver, 2016/08/04