X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fwhatnow%2Ftest-attach-detach;h=9f308aa322aeac809ebde91f3f3e386ca3f1dff0;hb=25e812757fa325d017b47144923dcad62b66399d;hp=a29727386d539c3a3387f0bcebbfedde9c107d2d;hpb=e107aac243dbd4021e57f4c455c7e3ffd82b819e;p=mmh

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index a297273..9f308aa 100755
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -6,6 +6,8 @@
 #
 ######################################################
 
+set -e
+
 if test -z "${MH_OBJ_DIR}"; then
     srcdir=`dirname "$0"`/../..
     MH_OBJ_DIR=`cd "$srcdir" && pwd`; export MH_OBJ_DIR
@@ -15,11 +17,10 @@ fi
 
 setup_test
 
-set -e
-
 cd "$MH_TEST_DIR"
-rm -f "baz's boz"
-touch "baz's boz"
+testname="baz's boz"
+testname_quoted="baz\'s\ boz"
+touch "$testname"
 # whatnow's attach stuff needs a draft to work on
 cp "$MH_TEST_DIR/Mail/inbox/1" "$MH_TEST_DIR/Mail/draft"
 
@@ -31,17 +32,49 @@ actual=$MH_TEST_DIR/$$.actual
 rm -f $expected $expectederr $actual $actualerr
 touch $expected $expectederr $actual $actualerr
 
-cat > $expected <<EOF
-baz's boz
+#
+# Sigh.  Different readline versions change echoing behavior, so we need
+# to deal.
+#
+
+set +e
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`
+set -e
+
+case ${whatnowtest} in
+    cd) cat > "$expected" <<EOF
+attach $testname_quoted
+alist
+$testname
+detach $testname_quoted
+alist
 EOF
+    ;;
+    "") cat > "$expected" <<EOF
+$testname
+EOF
+    ;;
+    *) echo "Unknown response to whatnow readline test"
+    echo "Response is: ${whatnowtest}"
+    exit 1
+    ;;
+esac
 
 # whatnow's exit status is always 1 so that is not a failure
 set +e
-echo "attach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "detach baz\\'s\\ boz" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
-echo "alist" | whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
+echo "attach $testname_quoted" | \
+  TERM=dumb whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
+echo "alist" | TERM=dumb whatnow -attach foo -noedit -prompt '' \
+				2>> $actualerr >> $actual
+echo "detach $testname_quoted" | \
+  TERM=dumb whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual
+echo "alist" | TERM=dumb whatnow -attach foo -noedit -prompt '' \
+				2>> $actualerr >> $actual
 set -e
 
-diff -u $expectederr $actualerr || exit 1
-diff -u $expected $actual
+check "$expectederr" "$actualerr"
+check "$expected" "$actual"
+
+test ${failed:-0} -eq 0  &&  rm "$testname"
+
+exit $failed