aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-06-23 00:49:04 +0200
committerLudovic Courtès <ludo@gnu.org>2016-06-23 00:50:24 +0200
commit125af57e09a00d861d4e9bf73f36a08296218f8c (patch)
treeba81606340c361c098a956bab16224ebf86f873a /gnu/tests
parentf6d5456b1b5b55e1ef48388271b29a2e19a646f9 (diff)
downloadguix-125af57e09a00d861d4e9bf73f36a08296218f8c.tar
guix-125af57e09a00d861d4e9bf73f36a08296218f8c.tar.gz
tests: basic: Don't hard-code the expected architecture name.
* gnu/tests/base.scm (run-basic-test)["uname"]: Don't hard-code the architecture.
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/base.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 8b1fefe9f8..4fe779802b 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -81,12 +81,13 @@ properties of running system to what's declared in OS, an <operating-system>."
(test-assert "uname"
(match (marionette-eval '(uname) marionette)
- (#("Linux" host-name version _ "x86_64")
+ (#("Linux" host-name version _ architecture)
(and (string=? host-name
#$(operating-system-host-name os))
(string-prefix? #$(package-version
(operating-system-kernel os))
- version)))))
+ version)
+ (string-prefix? architecture %host-type)))))
(test-assert "shell and user commands"
;; Is everything in $PATH?
@@ -166,7 +167,7 @@ info --version")
(system-test
(name "basic")
(description
- "Instrument %SIMPLE-OS, run it in a VM, and runs a series of basic
+ "Instrument %SIMPLE-OS, run it in a VM, and run a series of basic
functionality tests.")
(value
(mlet* %store-monad ((os -> (marionette-operating-system