[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: tests: Use the canonical current directory name.
From: |
Ludovic Courtès |
Subject: |
02/02: tests: Use the canonical current directory name. |
Date: |
Wed, 04 Nov 2015 11:18:43 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit c8855b991880897b2658dc90164e29c96e2aeb3a
Author: Ludovic Courtès <address@hidden>
Date: Wed Nov 4 12:10:11 2015 +0100
tests: Use the canonical current directory name.
* tests/guix-environment-container.sh (current_dir): New variable. Use
it when grepping "mounts".
---
tests/guix-environment-container.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tests/guix-environment-container.sh
b/tests/guix-environment-container.sh
index 141fd16..8b6f7cd 100644
--- a/tests/guix-environment-container.sh
+++ b/tests/guix-environment-container.sh
@@ -69,7 +69,8 @@ guix environment --container --ad-hoc --bootstrap
guile-bootstrap \
cat "$tmpdir/mounts"
test `wc -l < $tmpdir/mounts` -eq 3
-grep -e "$PWD$" $tmpdir/mounts # current directory
+current_dir="`cd $PWD; pwd -P`"
+grep -e "$current_dir$" $tmpdir/mounts # current directory
grep $(guix build guile-bootstrap) $tmpdir/mounts
grep -e "$NIX_STORE_DIR/.*-bash" $tmpdir/mounts # bootstrap bash