From 882383a9aa5fbeef6f29d359a786a6db7c9e03db Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 3 Oct 2014 11:02:11 +0200 Subject: download: Allow raw file names or file:// URLs. * guix/download.scm (url-fetch): When URL is a string, if it's not a URI or if it's a URI with 'file' or #f scheme, use 'add-to-store'. * tests/builders.scm ("url-fetch, file", "url-fetch, file URI"): New tests. --- tests/builders.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests') diff --git a/tests/builders.scm b/tests/builders.scm index ce1f3852d7..a2f500a94d 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -25,6 +25,7 @@ (define-module (test-builders) #:use-module (guix utils) #:use-module (guix base32) #:use-module (guix derivations) + #:use-module (guix hash) #:use-module (guix tests) #:use-module ((guix packages) #:select (package-derivation package-native-search-paths)) @@ -74,6 +75,22 @@ (define network-reachable? (file-exists? out-path) (valid-path? %store out-path)))) +(test-assert "url-fetch, file" + (let* ((file (search-path %load-path "guix.scm")) + (hash (call-with-input-file file port-sha256)) + (out (url-fetch %store file 'sha256 hash))) + (and (file-exists? out) + (valid-path? %store out)))) + +(test-assert "url-fetch, file URI" + (let* ((file (search-path %load-path "guix.scm")) + (hash (call-with-input-file file port-sha256)) + (out (url-fetch %store + (string-append "file://" (canonicalize-path file)) + 'sha256 hash))) + (and (file-exists? out) + (valid-path? %store out)))) + (test-assert "gnu-build-system" (and (build-system? gnu-build-system) (eq? gnu-build (build-system-builder gnu-build-system)))) -- cgit v1.2.3