diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /tests/cache.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
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 e46cdd816d..80b44d69aa 100644 --- a/tests/cache.scm +++ b/tests/cache.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2017, 2020 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,13 +24,6 @@ #:use-module ((guix utils) #:select (call-with-temporary-directory)) #:use-module (ice-9 match)) -(cond-expand - (guile-2.2 - ;; Guile 2.2.2 has a bug whereby 'time-monotonic' objects have seconds and - ;; nanoseconds swapped (fixed in Guile commit 886ac3e). Work around it. - (define time-monotonic time-tai)) - (else #t)) - (test-begin "cache") (test-equal "remove-expired-cache-entries" |