Removed remaining run_prog's from tests that set an

environment variable.

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index db1d3ba..f1407f6 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -132,7 +132,7 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
     echo "Unsupported width for U+2019: $width"
 fi
 

-LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 run_prog scan -width 75 last >"$actual"
+LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"

 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 27dcb9c..9f308aa 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -38,7 +38,7 @@ touch $expected $expectederr $actual $actualerr
 #
 
 set +e
 #
 
 set +e

-whatnowtest=`echo cd | TERM=dumb run_prog whatnow -prompt ''`
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`

 set -e
 
 case ${whatnowtest} in
 set -e
 
 case ${whatnowtest} in


@@ -63,13 +63,12 @@ esac
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \

-  TERM=dumb run_prog whatnow -attach foo -noedit -prompt '' 2>> $actualerr \
-    >> $actual
-echo "alist" | TERM=dumb run_prog whatnow -attach foo -noedit -prompt '' \
+  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
                                2>> $actualerr >> $actual
 echo "detach $testname_quoted" | \
   TERM=dumb whatnow -attach foo -noedit -prompt '' 2>> $actualerr >> $actual

-echo "alist" | TERM=dumb run_prog whatnow -attach foo -noedit -prompt '' \
+echo "alist" | TERM=dumb whatnow -attach foo -noedit -prompt '' \

                                2>> $actualerr >> $actual
 set -e
 
                                2>> $actualerr >> $actual
 set -e
 

diff --git a/test/whatnow/test-cd b/test/whatnow/test-cd
index bfa6f4e..48389cb 100755 (executable)
--- a/test/whatnow/test-cd
+++ b/test/whatnow/test-cd
@@ -32,7 +32,7 @@ actual=$MH_TEST_DIR/$$.actual
 #
 
 set +e
 #
 
 set +e

-whatnowtest=`echo cd | TERM=dumb run_prog whatnow -prompt ''`
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`

 set -e
 
 case ${whatnowtest} in
 set -e
 
 case ${whatnowtest} in


@@ -58,8 +58,7 @@ EOF
 # ||true to ignore whatnow's exit status
 # watch the quoting -- shell and printf and then the shell run inside whatnow
 printf 'cd %s/foo\\'"'"'s\\ bar\npwd\n' "$MH_TEST_DIR" | \
 # ||true to ignore whatnow's exit status
 # watch the quoting -- shell and printf and then the shell run inside whatnow
 printf 'cd %s/foo\\'"'"'s\\ bar\npwd\n' "$MH_TEST_DIR" | \

-  TERM=dumb run_prog whatnow -noedit -prompt '' 2> "$actualerr" > "$actual" || \
-  true
+  TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" > "$actual" || true

 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"

diff --git a/test/whatnow/test-ls b/test/whatnow/test-ls
index e23111c..b70f593 100755 (executable)
--- a/test/whatnow/test-ls
+++ b/test/whatnow/test-ls
@@ -33,7 +33,7 @@ actual=$MH_TEST_DIR/$$.actual
 #
 
 set +e
 #
 
 set +e

-whatnowtest=`echo cd | TERM=dumb run_prog whatnow -prompt ''`
+whatnowtest=`echo cd | TERM=dumb whatnow -prompt ''`

 set -e
 
 case ${whatnowtest} in
 set -e
 
 case ${whatnowtest} in


@@ -58,7 +58,7 @@ cat > $expectederr <<EOF
 EOF
 
 # NB use of sort as the order of output of ls is not guaranteed
 EOF
 
 # NB use of sort as the order of output of ls is not guaranteed

-echo 'ls' | TERM=dumb run_prog whatnow -noedit -prompt '' 2> "$actualerr" | \
+echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \

        sort > "$actual"
 
 check "$expectederr" "$actualerr" 'keep first'
        sort > "$actual"
 
 check "$expectederr" "$actualerr" 'keep first'


@@ -68,7 +68,7 @@ check "$expected" "$actual" 'keep first'
 # /bin/sh sets SHELL, which bash does.
 unset SHELL
 
 # /bin/sh sets SHELL, which bash does.
 unset SHELL
 

-echo 'ls' | TERM=dumb run_prog whatnow -noedit -prompt '' 2> "$actualerr" | \
+echo 'ls' | TERM=dumb whatnow -noedit -prompt '' 2> "$actualerr" | \

        sort > "$actual"
 
 check "$expectederr" "$actualerr"
        sort > "$actual"
 
 check "$expectederr" "$actualerr"