diff options
author | Huang Ying <huang.ying.caritas@gmail.com> | 2017-03-12 19:53:58 +0800 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-26 12:53:48 +0200 |
commit | addce19e2d38a197f5ea10eefb5f3cd25c3a52e7 (patch) | |
tree | 87f70b53d781a51da36f18f780bfdb586f94d26d /tests | |
parent | 7398d96ee9141768de2a33df94109f7f10637d27 (diff) | |
download | guix-addce19e2d38a197f5ea10eefb5f3cd25c3a52e7.tar guix-addce19e2d38a197f5ea10eefb5f3cd25c3a52e7.tar.gz |
union: Add create-all-directories? parameter to 'union-build'.
* guix/build/union.scm (union-build): Add create-all-directories? keyword
parameter.
* tests/union.scm ("union-build #:create-all-directories? #t"): New test.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/union.scm | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/union.scm b/tests/union.scm index cccf397181..b63edc757b 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -124,4 +124,24 @@ ;; new 'bin' sub-directory in the profile. (eq? 'directory (stat:type (lstat "bin")))))))) +(test-assert "union-build #:create-all-directories? #t" + (let* ((build `(begin + (use-modules (guix build union)) + (union-build (assoc-ref %outputs "out") + (map cdr %build-inputs) + #:create-all-directories? #t))) + (input (package-derivation %store %bootstrap-guile)) + (drv (build-expression->derivation %store "union-test-all-dirs" + build + #:modules '((guix build union)) + #:inputs `(("g" ,input))))) + (and (build-derivations %store (list drv)) + (with-directory-excursion (derivation->output-path drv) + ;; Even though there's only one input to the union, + ;; #:create-all-directories? #t must have created bin/ rather than + ;; making it a symlink to Guile's bin/. + (and (file-exists? "bin/guile") + (file-is-directory? "bin") + (eq? 'symlink (stat:type (lstat "bin/guile")))))))) + (test-end) |