diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:50:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 18:18:48 +0100 |
| commit | 8c986ab12034d67db836a881f57c69754d8073ae (patch) | |
| tree | bf5183011119695ac549d4cfff4dc2175e659397 /tests | |
| parent | 203795aceaabec0e0e5818e1650ad407d825d1b3 (diff) | |
| parent | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (diff) | |
| download | patches-8c986ab12034d67db836a881f57c69754d8073ae.tar patches-8c986ab12034d67db836a881f57c69754d8073ae.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-package.sh | 20 | ||||
| -rw-r--r-- | tests/utils.scm | 10 |
2 files changed, 26 insertions, 4 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 5e6ff8b012..cf1a185590 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> # # This file is part of GNU Guix. @@ -30,9 +30,10 @@ readlink_base () module_dir="t-guix-package-$$" profile="t-profile-$$" -rm -f "$profile" +tmpfile="t-guix-package-file-$$" +rm -f "$profile" "$tmpfile" -trap 'rm -f "$profile" "$profile-"[0-9]* ; rm -rf "$module_dir" t-home-'"$$" EXIT +trap 'rm -f "$profile" "$profile-"[0-9]* "$tmpfile"; rm -rf "$module_dir" t-home-'"$$" EXIT # Use `-e' with a non-package expression. if guix package --bootstrap -e +; @@ -96,6 +97,19 @@ test "`guix package -s "An example GNU package" | grep ^name:`" = \ "name: hello" test -z "`guix package -s "n0t4r341p4ck4g3"`" +# Search with one and then two regexps. +# First we get printed circuit boards *and* board games. +guix package -s '\<board\>' > "$tmpfile" +grep '^name: pcb' "$tmpfile" +grep '^name: gnubg' "$tmpfile" + +# Second we get only board games. +guix package -s '\<board\>' -s game > "$tmpfile" +grep -v '^name: pcb' "$tmpfile" > /dev/null +grep '^name: gnubg' "$tmpfile" + +rm -f "$tmpfile" + # Make sure `--search' can display all the packages. guix package --search="" > /dev/null diff --git a/tests/utils.scm b/tests/utils.scm index 04a859fc9d..a05faabc15 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; ;;; This file is part of GNU Guix. @@ -141,6 +141,14 @@ '(a #:foo 42 #:b b #:baz 3 #:c c #:bar 4))) +(test-equal "ensure-keyword-arguments" + '((#:foo 2) + (#:foo 2 #:bar 3) + (#:foo 42 #:bar 3)) + (list (ensure-keyword-arguments '(#:foo 2) '(#:foo 2)) + (ensure-keyword-arguments '(#:foo 2) '(#:bar 3)) + (ensure-keyword-arguments '(#:foo 2) '(#:bar 3 #:foo 42)))) + (let* ((tree (alist->vhash '((0 2 3) (1 3 4) (2) (3 5 6) (4 6) (5) (6)) hashq)) |