diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-21 13:22:32 -0400 |
| commit | 0661758e133c0384d20043d3526b5ebc794e1f04 (patch) | |
| tree | 46fb6d731fd0e562379ecfffba499deb17847a23 /tests | |
| parent | 539bf8f2c071b53834829259bb3fabf0390c5dc6 (diff) | |
| parent | c036959b1a61c37c9b7d72e655e1441f2feefb6e (diff) | |
| download | guix-0661758e133c0384d20043d3526b5ebc794e1f04.tar guix-0661758e133c0384d20043d3526b5ebc794e1f04.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-pack.sh | 6 | ||||
| -rw-r--r-- | tests/guix-system.sh | 4 | ||||
| -rw-r--r-- | tests/uuid.scm | 9 |
3 files changed, 13 insertions, 6 deletions
diff --git a/tests/guix-pack.sh b/tests/guix-pack.sh index 130389a7ad..917d52451c 100644 --- a/tests/guix-pack.sh +++ b/tests/guix-pack.sh @@ -20,9 +20,9 @@ # Test the `guix pack' command-line utility. # -# The bootstrap binaries are needed to run these tests, which usually requires -# a network connection. -if ! guix build -q guile-bootstrap; then +# A network connection is required to build %bootstrap-coreutils&co, +# which is required to run these tests with the --bootstrap option. +if ! guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null; then exit 77 fi diff --git a/tests/guix-system.sh b/tests/guix-system.sh index ff9114ab74..2b94bc0516 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -125,9 +125,9 @@ else then # FIXME: With Guile 2.2.0 the error is reported on line 4. # See <http://bugs.gnu.org/26107>. - grep "$tmpfile:[49]:[0-9]\+: GRUB-config.*[Uu]nbound variable" "$errorfile" + grep "$tmpfile:[49]:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile" else - grep "$tmpfile:9:[0-9]\+: GRUB-config.*[Uu]nbound variable" "$errorfile" + grep "$tmpfile:9:[0-9]\+:.*GRUB-config.*[Uu]nbound variable" "$errorfile" fi fi diff --git a/tests/uuid.scm b/tests/uuid.scm index 91a3482490..260614f079 100644 --- a/tests/uuid.scm +++ b/tests/uuid.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +57,13 @@ "1234-ABCD" (uuid->string (uuid "1234-abcd" 'fat32))) +(test-assert "uuid, dynamic value" + (let* ((good "4dab5feb-d176-45de-b287-9b0a6e4c01cb") + (bad (string-drop good 3))) + (and (uuid? (uuid good)) + (string=? good (uuid->string (uuid good))) + (not (uuid bad))))) + (test-assert "uuid=?" (and (uuid=? (uuid-bytevector (uuid "1234-abcd" 'fat32)) (uuid "1234-abcd" 'fat32)) |