diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-06 14:26:09 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-06 14:37:35 +0200 |
| commit | 477ee222aa796257b5f32966da662e76fe706332 (patch) | |
| tree | 551a91675cbae6c2eb170b1e05e2e206a854f74e /tests/guix-package.sh | |
| parent | a99b0ad785d5b31e9d9efd2d186ab5d53544b631 (diff) | |
| download | gnu-guix-477ee222aa796257b5f32966da662e76fe706332.tar gnu-guix-477ee222aa796257b5f32966da662e76fe706332.tar.gz | |
tests: Adjust 'guix package' test to "python2" name.
This is a followup to a7714d42de2c3082f3609d1e63c83d703fb39cf9, which
renamed Python 2.x to "python2".
* tests/guix-package.sh: Use g-wrap and guile@2.0 when testing
collisions.
Diffstat (limited to 'tests/guix-package.sh')
| -rw-r--r-- | tests/guix-package.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/guix-package.sh b/tests/guix-package.sh index aa5eaa66e7..3b3fa35cd8 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -60,12 +60,12 @@ test -L "$profile" && test -L "$profile-1-link" ! test -f "$profile-2-link" test -f "$profile/bin/guile" -# Collisions are properly flagged (in this case, 'python-wrapper' propagates -# python@3, which conflicts with python@2.) -if guix package --bootstrap -n -p "$profile" -i python@2 python-wrapper +# Collisions are properly flagged (in this case, 'g-wrap' propagates +# guile@2.2, which conflicts with guile@2.0.) +if guix package --bootstrap -n -p "$profile" -i g-wrap guile@2.0 then false; else true; fi -guix package --bootstrap -n -p "$profile" -i python@2 python-wrapper \ +guix package --bootstrap -n -p "$profile" -i g-wrap guile@2.0 \ --allow-collisions # No search path env. var. here. |