From a9a0227c0127e1813190a7664f7ad858e791480d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 15 Mar 2017 13:54:29 +0100 Subject: [PATCH] store: Adjust UTF-8 test to Guile 2.2. * tests/store.scm ("current-build-output-port, UTF-8 + garbage"): On Guile 2.2, expect REPLACEMENT CHARACTER instead of '?'. --- tests/store.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/store.scm b/tests/store.scm index 64d3553f25..c0ebe7b941 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -383,7 +383,9 @@ (package-derivation %store %bootstrap-guile)))) (guard (c ((nix-protocol-error? c) #t)) (build-derivations %store (list d)))))))) - "garbage: ?lambda: λ")) + (cond-expand + (guile-2.0 "garbage: ?lambda: λ") + (else "garbage: �lambda: λ")))) (test-assert "log-file, derivation" (let* ((b (add-text-to-store %store "build" "echo $foo > $out" '()))