examples: fix the test suites.

	* examples/calc++/test, examples/mfcalc/test (me): Be more
	meaningfull: include the example name.
	(prog): Factor.
	(run): Avoid printf, use echo.
	Add missing parens.
	(cleanup): New.
	Call it on trap.
	Remove the previous "rm" that did the cleanup.
	Move into a private directory to avoid concurrency issues.
	Reported by Jim Meyering.

diff --git a/examples/calc++/test b/examples/calc++/test
index 0dfe3685382ab7d965af4d15fb4270a1c24ebaf5..7930dc218e90f25a01b84156565eaeae15cecd7f 100755 (executable)
--- a/examples/calc++/test
+++ b/examples/calc++/test
@@ -15,7 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-me=`basename $0`
+me=`dirname $0`
+me=`basename $me`

 
 # Number of the current test.
 number=1
 
 # Number of the current test.
 number=1


@@ -24,31 +25,47 @@ number=1
 exit=true
 
 # The exercised program.
 exit=true
 
 # The exercised program.

-prog=./examples/calc++/calc++
+prog=../examples/$me/$me
+
+# cleanup
+# -------
+cleanup ()
+{
+  local status=$?
+  if test -z "$DEBUG"; then
+     cd ..
+     rm -rf $$.dir
+  fi
+  exit $status
+}
+trap cleanup 0 1 2 13 15
+mkdir $$.dir
+cd $$.dir

 
 # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
 # ---------------------------------------------------------
 run ()
 {
 
 # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
 # ---------------------------------------------------------
 run ()
 {

-  # Effective and expected exit status.
+  # Expected exit status.

   local sta_exp=$1
   shift
   local sta_exp=$1
   shift

+  # Expected output.

   local out_exp=$1
   shift
   $prog "$@" - <input >out_eff
   local out_exp=$1
   shift
   $prog "$@" - <input >out_eff

+  # Effective exit status.

   local sta_eff=$?
   local sta_eff=$?

+  # Effective output.

   local out_eff=`cat out_eff`
   if test $sta_eff -eq $sta_exp; then
     if test "$out_eff" = "$out_exp"; then
   local out_eff=`cat out_eff`
   if test $sta_eff -eq $sta_exp; then
     if test "$out_eff" = "$out_exp"; then

-      printf "$me: PASS: %2d\n" $number
+      echo "$me: PASS: $number"

     else
     else

-      printf "$me: FAIL: %2d (expected output: %s, effective: %s\n" \
-          $number "$out_exp" "$out_eff"
+      echo "$me: FAIL: $number (expected output: $out_exp, effective: $out_eff)"

       exit=false
     fi
   else
       exit=false
     fi
   else

-    printf "$me: FAIL: %2d (expected status: %d, effective: %d\n" \
-        $number $sta_exp $sta_eff
+    echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"

     exit=false
   fi
   number=`expr $number + 1`
     exit=false
   fi
   number=`expr $number + 1`


@@ -89,5 +106,4 @@ d := a + b * c
 EOF
 run 1 ''
 
 EOF
 run 1 ''
 

-rm input out_eff

 $exit
 $exit

diff --git a/examples/mfcalc/test b/examples/mfcalc/test
index edcbc14a1e69ea795a95d3a9eda76c3e0155b07b..f848bbdac9e75c0bc4f6d6718bfff60d6dcffcc1 100755 (executable)
--- a/examples/mfcalc/test
+++ b/examples/mfcalc/test
@@ -15,7 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-me=`basename $0`
+me=`dirname $0`
+me=`basename $me`

 
 # Number of the current test.
 number=1
 
 # Number of the current test.
 number=1


@@ -24,36 +25,53 @@ number=1
 exit=true
 
 # The exercised program.
 exit=true
 
 # The exercised program.

-prog=./examples/mfcalc/mfcalc
+prog=../examples/$me/$me
+
+# cleanup
+# -------
+cleanup ()
+{
+  local status=$?
+  if test -z "$DEBUG"; then
+     cd ..
+     rm -rf $$.dir
+  fi
+  exit $status
+}
+trap cleanup 0 1 2 13 15
+mkdir $$.dir
+cd $$.dir

 
 # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
 # ---------------------------------------------------------
 run ()
 {
 
 # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
 # ---------------------------------------------------------
 run ()
 {

-  # Effective and expected exit status.
+  # Expected exit status.

   local sta_exp=$1
   shift
   local sta_exp=$1
   shift

+  # Expected output.

   local out_exp=$1
   shift
   local out_exp=$1
   shift

-  $prog "$@" - < input >out_eff
+  $prog "$@" - <input >out_eff
+  # Effective exit status.

   local sta_eff=$?
   local sta_eff=$?

+  # Effective output.

   local out_eff=`cat out_eff`
   if test $sta_eff -eq $sta_exp; then
     if test "$out_eff" = "$out_exp"; then
   local out_eff=`cat out_eff`
   if test $sta_eff -eq $sta_exp; then
     if test "$out_eff" = "$out_exp"; then

-      printf "$me: PASS: %2d\n" $number
+      echo "$me: PASS: $number"

     else
     else

-      printf "$me: FAIL: %2d (expected output: %s, effective: %s\n" \
-          $number "$out_exp" "$out_eff"
+      echo "$me: FAIL: $number (expected output: $out_exp, effective: $out_eff)"

       exit=false
     fi
   else
       exit=false
     fi
   else

-    printf "$me: FAIL: %2d (expected status: %d, effective: %d\n" \
-        $number $sta_exp $sta_eff
+    echo "$me: FAIL: $number (expected status: $sta_exp, effective: $sta_eff)"

     exit=false
   fi
   number=`expr $number + 1`
 }
 
     exit=false
   fi
   number=`expr $number + 1`
 }
 

+

 cat >input <<EOF
 1+2*3
 EOF
 cat >input <<EOF
 1+2*3
 EOF


@@ -65,6 +83,4 @@ cat >input <<EOF
 EOF
 run 0 9
 
 EOF
 run 0 9
 

-
-rm input out_eff

 $exit
 $exit