From 7357138bba23851584f522e6a986ca3fc80dbf43 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 24 Aug 2013 16:58:44 +0200 Subject: packages: Allow file names as package sources. * guix/packages.scm (package-source-derivation): Add cases for SOURCE as a store path or user file. * tests/packages.scm ("package-source-derivation, file", "package-source-derivation, store path"): New tests. --- tests/packages.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/packages.scm b/tests/packages.scm index 78770c7d94..8619011f59 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -99,7 +99,27 @@ ("d" ,d) ("d/x" "something.drv")) (pk 'x (package-transitive-inputs e)))))) -(test-skip (if (not %store) 6 0)) +(test-skip (if (not %store) 8 0)) + +(test-assert "package-source-derivation, file" + (let* ((file (search-path %load-path "guix.scm")) + (package (package (inherit (dummy-package "p")) + (source file))) + (source (package-source-derivation %store + (package-source package)))) + (and (store-path? source) + (valid-path? %store source) + (equal? (call-with-input-file source get-bytevector-all) + (call-with-input-file file get-bytevector-all))))) + +(test-assert "package-source-derivation, store path" + (let* ((file (add-to-store %store "guix.scm" #t "sha256" + (search-path %load-path "guix.scm"))) + (package (package (inherit (dummy-package "p")) + (source file))) + (source (package-source-derivation %store + (package-source package)))) + (string=? file source))) (test-assert "return values" (let-values (((drv-path drv) -- cgit v1.2.3