diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 22:18:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-24 22:18:07 +0200 |
| commit | 1007b6bf0bef3f662f65ffdd0d4383179dd07355 (patch) | |
| tree | 4a9b2a4baa2d82434e12fe4aacc8f28e3266793e /tests | |
| parent | 12cd4dd3a9052491e3912ffeecbe8854ea9b971a (diff) | |
| parent | a7a4fd9a7cd02e4897e7b2156bd9ecc7e72e9818 (diff) | |
| download | guix-1007b6bf0bef3f662f65ffdd0d4383179dd07355.tar guix-1007b6bf0bef3f662f65ffdd0d4383179dd07355.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cran.scm | 3 | ||||
| -rw-r--r-- | tests/ui.scm | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/cran.scm b/tests/cran.scm index c9cb5f69d0..ba5699a133 100644 --- a/tests/cran.scm +++ b/tests/cran.scm @@ -149,8 +149,7 @@ ('version "1.2.3") ('source ('origin ('method 'url-fetch) - ('uri ('string-append "mirror://cran/src/contrib/my-example-sxml_" - 'version ".tar.gz")) + ('uri ('cran-uri "my-example-sxml" 'version)) ('sha256 ('base32 (? string? hash))))) diff --git a/tests/ui.scm b/tests/ui.scm index 25fc709431..bd4c907525 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -22,6 +22,7 @@ #:use-module (guix profiles) #:use-module (guix store) #:use-module (guix derivations) + #:use-module (guix tests) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) @@ -89,6 +90,12 @@ interface, and powerful string processing.") (fill-paragraph "First line. Second line" 24)) +(test-equal "package-description-string vs. Unicode" + "b•ll•t\n\n" ;see <http://bugs.gnu.org/21536> + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (package-description-string + (dummy-package "foo" (description "b•ll•t"))))) + (test-equal "package-specification->name+version+output" '(("guile" #f "out") ("guile" "2.0.9" "out") |