Delete declaration already available from included header file.

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index d0c446def79dc6fc1cca7e1b304d046b4c38ac44..1dbbf2cc22bb54e1fc39f6b5344491e6fb9909c2 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -35,7 +35,7 @@ HOME="$MH_TEST_DIR"
 export HOME
 
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
 export HOME
 
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE

-unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER XOAUTH SMTPUTF8
+unset MHLDEBUG MHWDEBUG PAGER XOAUTH SMTPUTF8

 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
 unset LANG LC_ALL LC_CTYPE
 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
 unset LANG LC_ALL LC_CTYPE


@@ -70,8 +70,8 @@ fi
 
 test_skip ()
 {
 
 test_skip ()
 {

-  WHY="$1"
-  echo "$Test $0 SKIP ($WHY)"
+  why="$1"
+  echo "$0: skipped: $why"

   exit 77
 }
 
   exit 77
 }
 


@@ -311,7 +311,7 @@ cleanup() {
     #### 1) Set test name before running the test, use start_test().
     #### 2) Unset upon successful completion, use finish_test().
     if test -n "$nmh_tests_testname"; then
     #### 1) Set test name before running the test, use start_test().
     #### 2) Unset upon successful completion, use finish_test().
     if test -n "$nmh_tests_testname"; then

-        echo $nmh_tests_testname failed
+        echo "first named test failure: $nmh_tests_testname"

     fi
 
     #### Exit with non-zero status if failure.  Failure is defined as either
     fi
 
     #### Exit with non-zero status if failure.  Failure is defined as either