calc++: factor for other extracted tests.

[bison.git] / examples / calc++ / test

diff --git a/examples/calc++/test b/examples/calc++/test
index 150f161c8bc2872ffe2b1720bc6ddef14b32fb09..0dfe3685382ab7d965af4d15fb4270a1c24ebaf5 100755 (executable)
--- a/examples/calc++/test
+++ b/examples/calc++/test
@@ -15,11 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-test -z "$VERBOSE" && {
-   exec > /dev/null 2>&1
-   set -x
-}
-
 me=`basename $0`
 
 # Number of the current test.
@@ -28,6 +23,9 @@ number=1
 # Exit status of this script.
 exit=true
 
+# The exercised program.
+prog=./examples/calc++/calc++
+
 # run EXPECTED-EXIT-STATUS EXPECTED-OUTPUT [PARSER-OPTIONS]
 # ---------------------------------------------------------
 run ()
@@ -37,7 +35,7 @@ run ()
   shift
   local out_exp=$1
   shift
-  ./examples/calc++/calc++ "$@" input >out_eff
+  $prog "$@" - <input >out_eff
   local sta_eff=$?
   local out_eff=`cat out_eff`
   if test $sta_eff -eq $sta_exp; then
@@ -56,6 +54,14 @@ run ()
   number=`expr $number + 1`
 }
 
+
+cat >input <<EOF
+toto := 1
+toto
+EOF
+run 0 1 -s
+
+
 cat >input <<EOF
 a := 1
 b := 2
@@ -81,14 +87,7 @@ cat >input <<EOF
 a := 1
 d := a + b * c
 EOF
-run 1 '' input
-
-
-cat >input <<EOF
-toto := 1
-toto
-EOF
-run 0 1 -s
+run 1 ''
 
 rm input out_eff
 $exit