diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-14 11:55:07 +0100 |
| commit | c4a1b6c2ba479c6abcd22cab6a1fcd560469e986 (patch) | |
| tree | 057fb773fcac4200ea66a0267a818be61cca3104 /tests | |
| parent | 2ed11b3a3e05549ed6ef8a604464f424c0eeae1c (diff) | |
| parent | 45c5b47b96a238c764c2d32966267f7f897bcc3d (diff) | |
| download | gnu-guix-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar gnu-guix-c4a1b6c2ba479c6abcd22cab6a1fcd560469e986.tar.gz | |
Merge branch 'master' into 'core-updates'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/guix-build.sh | 10 | ||||
| -rw-r--r-- | tests/guix-package.sh | 13 |
2 files changed, 23 insertions, 0 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh index 27b3fdc39e..836c45e776 100644 --- a/tests/guix-build.sh +++ b/tests/guix-build.sh @@ -84,3 +84,13 @@ guix build -e "(begin # Running a gexp. guix build -e '#~(mkdir #$output)' -d guix build -e '#~(mkdir #$output)' -d | grep 'gexp\.drv' + +# Using 'GUIX_BUILD_OPTIONS'. +GUIX_BUILD_OPTIONS="--dry-run" +export GUIX_BUILD_OPTIONS + +guix build emacs + +GUIX_BUILD_OPTIONS="--something-completely-crazy" +if guix build emacs; +then false; else true; fi diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 3e0e36fa23..f4e091a5a2 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -289,3 +289,16 @@ GUIX_PACKAGE_PATH="$module_dir" export GUIX_PACKAGE_PATH guix package -A emacs-foo-bar | grep 42 guix package -i emacs-foo-bar-42 -n +unset GUIX_PACKAGE_PATH + +# Using 'GUIX_BUILD_OPTIONS'. + +available="`guix package -A | sort`" +GUIX_BUILD_OPTIONS="--dry-run" +export GUIX_BUILD_OPTIONS + +# Make sure $GUIX_BUILD_OPTIONS is not simply appended to the command-line, +# which would break 'guix package -A' and similar. +available2="`guix package -A | sort`" +test "$available2" = "$available" +guix package -I |