ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: basic: Don't hard-code the expected architecture name.

Browse source 
* gnu/tests/base.scm (run-basic-test)["uname"]: Don't hard-code the
architecture.
This commit is contained in:
Ludovic Courtès 2016-06-23 00:49:04 +02:00
parent f6d5456b1b
commit 125af57e09
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/tests/base.scm
View file

@ -81,12 +81,13 @@ (define marionette
(test-assert "uname" (test-assert "uname"
(match (marionette-eval '(uname) marionette) (match (marionette-eval '(uname) marionette)
(#("Linux" host-name version _ "x86_64") (#("Linux" host-name version _ architecture)
(and (string=? host-name (and (string=? host-name
#$(operating-system-host-name os)) #$(operating-system-host-name os))
(string-prefix? #$(package-version (string-prefix? #$(package-version
(operating-system-kernel os)) (operating-system-kernel os))
version))))) version)
(string-prefix? architecture %host-type)))))
(test-assert "shell and user commands" (test-assert "shell and user commands"
;; Is everything in $PATH? ;; Is everything in $PATH?
@ -166,7 +167,7 @@ (define %test-basic-os
(system-test (system-test
(name "basic") (name "basic")
(description (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.") functionality tests.")
(value (value
(mlet* %store-monad ((os -> (marionette-operating-system (mlet* %store-monad ((os -> (marionette-operating-system