diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-03-22 15:58:49 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-22 16:49:47 +0100 |
| commit | 9acacb71c958218fd69cf0fb9df0b439a980a0f2 (patch) | |
| tree | 67324a0405e11b78490faca2773e647bd9c96f5d /tests/cache.scm | |
| parent | 99b23eabdbb660b46403649997c3ed41aeab95bb (diff) | |
Remove workaround for 'time-monotonic' in Guile 2.2.2.
This is a followup to e688c2df3924423b67892cc9939ca099c729d1cb.
* build-aux/hydra/evaluate.scm <top level>: Remove 'time-monotonic'
definition.
* guix/cache.scm: Likewise.
* guix/progress.scm: Likewise.
* guix/scripts/substitute.scm: Likewise.
* guix/scripts/weather.scm: Likewise.
* tests/cache.scm: Likewise.
Diffstat (limited to 'tests/cache.scm')
| -rw-r--r-- | tests/cache.scm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/cache.scm b/tests/cache.scm index e46cdd816dc..80b44d69aad 100644 --- a/tests/cache.scm +++ b/tests/cache.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2017, 2020 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 | ;;; |
| @@ -24,13 +24,6 @@ | |||
| 24 | #:use-module ((guix utils) #:select (call-with-temporary-directory)) | 24 | #:use-module ((guix utils) #:select (call-with-temporary-directory)) |
| 25 | #:use-module (ice-9 match)) | 25 | #:use-module (ice-9 match)) |
| 26 | 26 | ||
| 27 | (cond-expand | ||
| 28 | (guile-2.2 | ||
| 29 | ;; Guile 2.2.2 has a bug whereby 'time-monotonic' objects have seconds and | ||
| 30 | ;; nanoseconds swapped (fixed in Guile commit 886ac3e). Work around it. | ||
| 31 | (define time-monotonic time-tai)) | ||
| 32 | (else #t)) | ||
| 33 | |||
| 34 | (test-begin "cache") | 27 | (test-begin "cache") |
| 35 | 28 | ||
| 36 | (test-equal "remove-expired-cache-entries" | 29 | (test-equal "remove-expired-cache-entries" |
