[teyjus] r1174 committed - Another test for read + possibility of writing more general tests

[tey...@googlecode.com]

Revision: 1174
Author: fafo...@gmail.com
Date: Tue Jan 27 14:49:58 2015 UTC
Log: Another test for read + possibility of writing more general tests

https://code.google.com/p/teyjus/source/detail?r=1174

Added:
/branches/ocaml-builtins/source/test/io_tests/read/read_1.sh
/branches/ocaml-builtins/source/test/io_tests/read/read_2.sh
Deleted:
/branches/ocaml-builtins/source/test/io_tests/read/read.sh
Modified:
/branches/ocaml-builtins/source/test/io_tests/run_all.sh

=======================================
--- /dev/null
+++ /branches/ocaml-builtins/source/test/io_tests/read/read_1.sh Tue Jan 27
14:49:58 2015 UTC
@@ -0,0 +1,6 @@
+TESTNAME=`basename $0`
+INPUT="3."
+QUERY="read X, Y is X + 1."
+EXPECTED="Y = 4
+X = 3"
+gives_result_stdin "$INPUT" "$QUERY" "$EXPECTED" "$TESTNAME"
=======================================
--- /dev/null
+++ /branches/ocaml-builtins/source/test/io_tests/read/read_2.sh Tue Jan 27
14:49:58 2015 UTC
@@ -0,0 +1,5 @@
+TESTNAME=`basename $0`
+INPUT="\"a very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long line\"."
+QUERY="read X."
+EXPECTED="X = \"a very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long linea very long linea very long linea very long linea very
long linea very long linea very long linea very long linea very long linea
very long linea very long linea very long linea very long linea very long
linea very long line\""
+gives_result_stdin "$INPUT" "$QUERY" "$EXPECTED" "$TESTNAME"
=======================================
--- /branches/ocaml-builtins/source/test/io_tests/read/read.sh Sun Jan 25
21:46:09 2015 UTC
+++ /dev/null
@@ -1,5 +0,0 @@
-TESTNAME=`basename $0`
-INPUT="3."
-QUERY="read X, Y is X + 1."
-EXPECTED="Y = 4"
-gives_result_stdin "$INPUT" "$QUERY" "$EXPECTED" "$TESTNAME"
=======================================
--- /branches/ocaml-builtins/source/test/io_tests/run_all.sh Sun Jan 25
21:46:09 2015 UTC
+++ /branches/ocaml-builtins/source/test/io_tests/run_all.sh Tue Jan 27
14:49:58 2015 UTC
@@ -2,18 +2,21 @@
export TJSIM=../../../tjsim


+# WARNING: dirty hacks!
+# We assume that no more than 20 variables binding will be outputed by
tjsim
+
# Allow to test inputs given from stdin
function gives_result_stdin {
# $1 : input from stdin
# $2 : query
# $3 : expected result
# $4 : name of the test
- RES=`echo "$1" | "$TJSIM" --solve "$2" | sed -n '5 p'`
+ RES=`echo "$1" | "$TJSIM" --batch --solve "$2" | grep -A20 "The answer" |
tail -n +2`
if [ "$RES" = "$3" ]; then
echo "$4" "success"
exit 0
else
- RES=`echo "$1" | "$TJSIM" --solve "$2"`
+ RES=`echo "$1" | "$TJSIM" --batch --solve "$2"`
echo "$4 failure (the result $3 was expected but got $RES"
echo ""
exit -1
@@ -24,7 +27,8 @@
# $1 : query
# $2 : expected result
# $3 : name of the test
- RES=`"$TJSIM" --batch --solve "$1" | sed -n '3 p'`
+ #RES=`"$TJSIM" --batch --solve "$1" | sed -n '3 p'`
+ RES=`"$TJSIM" --batch --solve "$1" | grep -A20 "The answer" | tail -n +2`
if [ "$RES" = "$2" ]; then
echo "$3" "success"
exit 0