From: David Levine <levinedl@acm.org>
Date: Sat, 20 Dec 2014 16:42:11 +0000 (-0600)
Subject: Set COLUMNS in test-cd if using readline so that its wrapping doesn't
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/d4952eb5d87466fd765d35c0883ebf24cd2adb7b?hp=7ae9fd31204fa5873ceebf1fed5ab22588bd9bd7

Set COLUMNS in test-cd if using readline so that its wrapping doesn't
disturb the test output.  The problem arose with a long workspace path.
---

diff --git a/test/whatnow/test-cd b/test/whatnow/test-cd
index 8b01ab6c..e5111bdd 100755
--- a/test/whatnow/test-cd
+++ b/test/whatnow/test-cd
@@ -37,13 +37,17 @@ actual=$MH_TEST_DIR/$$.actual
 set +e
 whatnowtest=`echo cd | whatnow -prompt ''`
 set -e
-
 case ${whatnowtest} in
     cd) cat > "$expected" <<EOF
 cd ${MH_TEST_DIR}/foo\'s\ bar
 pwd
 $SPDIR
 EOF
+    # If path to $SPDIR is too long, readline will wrap and disturb
+    # the actual output.  It obeys COLUMNS, so set that to a value
+    # that should be longer that $SPDIR plus a bit more.
+    COLUMNS=`getconf PATH_MAX . 2>/dev/null`  ||  COLUMNS=8192
+    export COLUMNS
     ;;
     "") cat > "$expected" <<EOF
 $SPDIR