Fixed printf's in test suite.

[mmh] / test / whatnow / test-cd

diff --git a/test/whatnow/test-cd b/test/whatnow/test-cd
index 1ff5d96..48389cb 100755 (executable)
--- a/test/whatnow/test-cd
+++ b/test/whatnow/test-cd
@@ -27,17 +27,38 @@ actualerr=$MH_TEST_DIR/$$.actualerr
 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
+cd ${MH_TEST_DIR}/foo\'s\ bar
+pwd
+$SPDIR
+EOF
+    ;;
+    "") cat > "$expected" <<EOF
 $SPDIR
 EOF
+    ;;
+    *) echo "Unknown response to whatnow readline test"
+    echo "Response is: ${whatnowtest}"
+    exit 1
+    ;;
+esac
 
 cat > $expectederr <<EOF
 EOF
 
 # ||true to ignore whatnow's exit status
 # watch the quoting -- shell and printf and then the shell run inside whatnow
-printf "cd $MH_TEST_DIR/foo\\\\'s\\\\ bar\npwd\n" | \
-  whatnow -noedit -prompt '' 2> "$actualerr" > "$actual" || true
+printf 'cd %s/foo\\'"'"'s\\ bar\npwd\n' "$MH_TEST_DIR" | \
+  TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" > "$actual" || true
 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"