diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-08-23 17:45:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-08-23 18:41:49 +0200 |
| commit | b908fcd8c02c26b1e6cdc636b63306a01a21b994 (patch) | |
| tree | b20b1849c6862437fbd97b683066fbd27411f748 /tests | |
| parent | d78bc23411b1351ff9495a511c22b27d17f9226f (diff) | |
| download | guix-b908fcd8c02c26b1e6cdc636b63306a01a21b994.tar guix-b908fcd8c02c26b1e6cdc636b63306a01a21b994.tar.gz | |
pack: '-R' honors the requested output.
Fixes <https://bugs.gnu.org/36925>.
Reported by Jesse Gibbons <jgibbons2357@gmail.com>.
* guix/scripts/pack.scm (wrapped-package): Add 'output*' parameter.
[build]: Define 'input' and 'target'; use them instead of #$package and
#$output, respectively.
(wrapped-manifest-entry): New procedure.
(map-manifest-entries): Call PROC directly.
(guix-pack): Pass WRAPPED-MANIFEST-ENTRY to 'map-manifest-entries'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-pack-relocatable.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh index ebada62c01..e93610eedc 100644 --- a/tests/guix-pack-relocatable.sh +++ b/tests/guix-pack-relocatable.sh @@ -78,3 +78,9 @@ else "$test_directory/Bin/sed" --version > "$test_directory/output" fi grep 'GNU sed' "$test_directory/output" +chmod -Rf +w "$test_directory"; rm -rf "$test_directory"/* + +# Ensure '-R' works with outputs other than "out". +tarball="`guix pack -R -S /share=share groff:doc`" +(cd "$test_directory"; tar xvf "$tarball") +test -d "$test_directory/share/doc/groff/html" |