From ee48b283fadca825ca08500eeb3870fd4141221e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Jul 2013 22:53:31 +0200 Subject: tests: Adjust `package-field-location' test for Guile <= 2.0.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * tests/packages.scm ("package-field-location"): Check the result of `read-at' against both VALUE and (FIELD VALUE). Reported by Matthew Lien - 練喆明" . --- tests/packages.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/packages.scm') diff --git a/tests/packages.scm b/tests/packages.scm index a4bb7fbd31..78770c7d94 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -70,10 +70,14 @@ (define read-at (goto port line column) (read port)))))) - (and (equal? (read-at (package-field-location %bootstrap-guile 'name)) - (package-name %bootstrap-guile)) - (equal? (read-at (package-field-location %bootstrap-guile 'version)) - (package-version %bootstrap-guile)) + ;; Until Guile 2.0.6 included, source properties were added only to pairs. + ;; Thus, check against both VALUE and (FIELD VALUE). + (and (member (read-at (package-field-location %bootstrap-guile 'name)) + (let ((name (package-name %bootstrap-guile))) + (list name `(name ,name)))) + (member (read-at (package-field-location %bootstrap-guile 'version)) + (let ((version (package-version %bootstrap-guile))) + (list version `(version ,version)))) (not (package-field-location %bootstrap-guile 'does-not-exist))))) (test-assert "package-transitive-inputs" -- cgit v1.2.3