summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortgoodwin <tgoodwin>1998-10-29 14:52:13 +0000
committerToby Goodwin <toby@paccrat.org>2015-05-16 21:23:13 +0100
commit5da6a89b1e630263d034aab99c7a1056ec7891c4 (patch)
treeee580f1b08ae970362dd3683f308cad63dc3af22
parentc2f4ccc59f6760f6eed41cc485d079eb7b9b3e48 (diff)
fix test for cdpath
-rw-r--r--ChangeLog2
-rw-r--r--trip.rc3
2 files changed, 2 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c05e27a..f934ec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -479,4 +479,4 @@ Changes since rc-1.5b2
Testing: add `testing' auxiliary program; use `testing' to generate
null character on the fly (since it's a nuisance having a literal
null character in trip.rc); reset sigexit in `fn fail'; add test for
- nonblocking input file descriptor.
+ nonblocking input file descriptor; fix test for cdpath.
diff --git a/trip.rc b/trip.rc
index 4f78636..717b0a2 100644
--- a/trip.rc
+++ b/trip.rc
@@ -259,8 +259,7 @@ pwd=`/bin/pwd cdpath=/ { # some local assignments
# Test that cd to a directory found via cdpath produces output
# when interactive.
-if (!~ `{$rc -i -c 'cdpath=/ cd tmp'} `{sh -c 'cd /tmp; /bin/pwd'})
- fail cdpath produced wrong output
+submatch 'cdpath=/ cd tmp' /tmp 'cdpath produced wrong output'
*=(1 2 3 4 5) {
expect bad number