diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-25 15:37:39 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-25 16:02:53 +0100 |
| commit | c136da3fbd92a5db1f889d37f0a7c938ccd63648 (patch) | |
| tree | 1980f0f08ac4655fefacccfa8380464b47113c09 | |
| parent | c74f19d758c786d30ee238e3bc8c4e3f8893ba4b (diff) | |
| download | guix-c136da3fbd92a5db1f889d37f0a7c938ccd63648.tar guix-c136da3fbd92a5db1f889d37f0a7c938ccd63648.tar.gz | |
tests: Adjust to 'show-manifest-transaction' changes.
This is a followup to 3e5ab0a7a9399bb098b9ced46bf3cbf4085c6bab.
* tests/ui.scm ("show-manifest-transaction"): Update regexp.
* tests/guix-package.sh: Adjust Emacs regexp in --with-source test.
| -rw-r--r-- | tests/guix-package.sh | 3 | ||||
| -rw-r--r-- | tests/ui.scm | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index f9fb31033e..1f955257be 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -189,8 +189,7 @@ emacs_tarball="$module_dir/emacs-42.5.9rc7.tar.gz" touch "$emacs_tarball" guix package -p "$profile" -i emacs --with-source="$emacs_tarball" -n \ 2> "$tmpfile" -grep -E 'emacs[[:blank:]]+42\.5\.9rc7[[:blank:]]+.*-emacs-42.5.9rc7' \ - "$tmpfile" +grep -E 'emacs[[:blank:]]+42\.5\.9rc7' "$tmpfile" rm "$emacs_tarball" "$tmpfile" rmdir "$module_dir" diff --git a/tests/ui.scm b/tests/ui.scm index 05eace6721..3dc6952e1f 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -252,12 +252,12 @@ Second line" 24)) (let* ((m (manifest (list guile-1.8.8))) (t (manifest-transaction (install (list guile-2.0.9))))) (with-store store - (and (string-match "guile\t1.8.8 → 2.0.9" + (and (string-match "guile +1.8.8 → 2.0.9" (with-fluids ((%default-port-encoding "UTF-8")) (with-error-to-string (lambda () (show-manifest-transaction store m t))))) - (string-match "guile\t1.8.8 -> 2.0.9" + (string-match "guile +1.8.8 -> 2.0.9" (with-error-to-string (lambda () ;; In Guile 2.2, %DEFAULT-PORT-ENCODING doesn't |