diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-01-06 22:02:40 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-01-09 14:47:53 +0100 |
| commit | a65177a657b0cb36d45f2e8db574ea9c10f89a1f (patch) | |
| tree | 1e2ccdbccc0d6fd39461ce31a8677be7ce86675d /tests/status.scm | |
| parent | 0991fd53367907908fbd901a9fbe79540e4e4527 (diff) | |
maint: Remove 'cond-expand' forms for Guile 2.0.
Note: Leave 'cond-expand' forms used in the build-side modules that can
run on %BOOTSTRAP-GUILE, which is currently Guile 2.0.
* guix/build/compile.scm: Move 'use-modules' clause from 'cond-expand'
to 'define-module' form.
(%default-optimizations): Remove 'cond-expand'.
* guix/build/download.scm (tls-wrap): Remove 'cond-expand'.
* guix/build/syscalls.scm: Remove 'cond-expand' form around
'%set-automatic-finalization-enabled?!' and
'without-automatic-finalization'.
* guix/inferior.scm (port->inferior): Remove 'cond-expand'.
* guix/scripts/pack.scm (wrapped-package)[build]: Remove 'cond-expand'.
* guix/status.scm (build-event-output-port): Remove 'cond-expand'.
* guix/store.scm (open-inet-socket): Remove 'cond-expand'.
* guix/ui.scm (install-locale): Remove 'cond-expand'.
* tests/status.scm ("current-build-output-port, UTF-8 + garbage"):
Remove 'cond-expand'.
* tests/store.scm ("current-build-output-port, UTF-8 + garbage"):
Remove 'cond-expand'.
Diffstat (limited to 'tests/status.scm')
| -rw-r--r-- | tests/status.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/status.scm b/tests/status.scm index 99abb41c8bc..08a3153218d 100644 --- a/tests/status.scm +++ b/tests/status.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; | 3 | ;;; |
| 4 | ;;; This file is part of GNU Guix. | 4 | ;;; This file is part of GNU Guix. |
| 5 | ;;; | 5 | ;;; |
| @@ -125,9 +125,7 @@ | |||
| 125 | 125 | ||
| 126 | (test-equal "current-build-output-port, UTF-8 + garbage" | 126 | (test-equal "current-build-output-port, UTF-8 + garbage" |
| 127 | ;; What about a mixture of UTF-8 + garbage? | 127 | ;; What about a mixture of UTF-8 + garbage? |
| 128 | (let ((replacement (cond-expand | 128 | (let ((replacement "�")) |
| 129 | ((and guile-2 (not guile-2.2)) "?") | ||
| 130 | (else "�")))) | ||
| 131 | `((build-log #f ,(string-append "garbage: " replacement "lambda: λ\n")))) | 129 | `((build-log #f ,(string-append "garbage: " replacement "lambda: λ\n")))) |
| 132 | (let-values (((port get-status) (build-event-output-port cons '()))) | 130 | (let-values (((port get-status) (build-event-output-port cons '()))) |
| 133 | (display "garbage: " port) | 131 | (display "garbage: " port) |
