projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed "sendmail" mts method to "sendmail/smtp", allowing "sendmail"
[mmh]
/
test
/
whatnow
/
test-ls
diff --git
a/test/whatnow/test-ls
b/test/whatnow/test-ls
index
c289830
..
6509fd0
100755
(executable)
--- a/
test/whatnow/test-ls
+++ b/
test/whatnow/test-ls
@@
-28,16
+28,38
@@
actualerr=$MH_TEST_DIR/$$.actualerr
expected=$MH_TEST_DIR/$$.expected
actual=$MH_TEST_DIR/$$.actual
expected=$MH_TEST_DIR/$$.expected
actual=$MH_TEST_DIR/$$.actual
-cat > $expected <<EOF
+#
+# Handle different output depending on readline version
+#
+
+set +e
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`
+set -e
+
+case "${whatnowtest}" in
+ cd) cat > "$expected" <<EOF
+baz
+boz
+ls
+EOF
+ ;;
+ "") cat > "$expected" <<EOF
baz
boz
EOF
baz
boz
EOF
+ ;;
+ *) echo "Unknown response to whatnow readline test"
+ echo "Response is: ${whatnowtest}"
+ exit 1
+ ;;
+esac
cat > $expectederr <<EOF
EOF
# NB use of sort as the order of output of ls is not guaranteed
cat > $expectederr <<EOF
EOF
# NB use of sort as the order of output of ls is not guaranteed
-echo 'ls' | whatnow -noedit -prompt '' 2> "$actualerr" | sort > "$actual"
+echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \
+ sort > "$actual"
check "$expectederr" "$actualerr"
check "$expected" "$actual"
check "$expectederr" "$actualerr"
check "$expected" "$actual"