From fb2dab51f21dd0fd326cd434f071dd8d3d982789 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 15 Mar 2011 14:27:33 -0400 Subject: Use a flags variable for invoking dimension in tests. --- tests/dimension/Makefile.am | 2 +- tests/dimension/arithexp.sh | 2 +- tests/dimension/csg.sh | 4 ++-- tests/dimension/demo.sh | 4 ++-- tests/dimension/directives.sh | 2 +- tests/dimension/integer-overflow.sh | 2 +- tests/dimension/invalid-macro.sh | 2 +- tests/dimension/labels.sh | 2 +- tests/dimension/numeric.sh | 2 +- tests/dimension/punctuation.sh | 2 +- tests/dimension/strings.sh | 2 +- tests/dimension/tbuffer-overlap.sh | 2 +- tests/dimension/transformations.sh | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/dimension/Makefile.am b/tests/dimension/Makefile.am index eda2d27..c54bcd4 100644 --- a/tests/dimension/Makefile.am +++ b/tests/dimension/Makefile.am @@ -31,7 +31,7 @@ TESTS = punctuation.sh \ integer-overflow.sh \ csg.sh \ demo.sh -TESTS_ENVIRONMENT = top_builddir=$(top_builddir) +TESTS_ENVIRONMENT = top_builddir=$(top_builddir) dimension_flags=--strict .sh: cp $(srcdir)/$@ . diff --git a/tests/dimension/arithexp.sh b/tests/dimension/arithexp.sh index a7e3e29..e46ab04 100755 --- a/tests/dimension/arithexp.sh +++ b/tests/dimension/arithexp.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -arithexp=$(${top_builddir}/dimension/dimension --strict --parse ${srcdir}/arithexp.pov) +arithexp=$(${top_builddir}/dimension/dimension ${dimension_flags} --parse ${srcdir}/arithexp.pov) arithexp_exp="$(echo -n \ '((object (sphere diff --git a/tests/dimension/csg.sh b/tests/dimension/csg.sh index 7d07cb0..b57389d 100755 --- a/tests/dimension/csg.sh +++ b/tests/dimension/csg.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -csg=$(${top_builddir}/dimension/dimension --strict -w768 -h480 --parse ${srcdir}/csg.pov) +csg=$(${top_builddir}/dimension/dimension ${dimension_flags} -w768 -h480 --parse ${srcdir}/csg.pov) csg_exp="$(echo -n \ '((camera perspective @@ -91,4 +91,4 @@ if [ "$csg" != "$csg_exp" ]; then exit 1 fi -${top_builddir}/dimension/dimension --strict -w768 -h480 -o csg.png ${srcdir}/csg.pov +${top_builddir}/dimension/dimension ${dimension_flags} -w768 -h480 -o csg.png ${srcdir}/csg.pov diff --git a/tests/dimension/demo.sh b/tests/dimension/demo.sh index 2dbb3f0..10cf13b 100755 --- a/tests/dimension/demo.sh +++ b/tests/dimension/demo.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -demo=$(${top_builddir}/dimension/dimension --strict -w768 -h480 --parse ${srcdir}/demo.pov) +demo=$(${top_builddir}/dimension/dimension ${dimension_flags} -w768 -h480 --parse ${srcdir}/demo.pov) demo_exp=$(echo -n \ '((camera perspective @@ -214,4 +214,4 @@ if [ "$demo" != "$demo_exp" ]; then exit 1 fi -${top_builddir}/dimension/dimension --strict -w768 -h480 -o demo.png ${srcdir}/demo.pov +${top_builddir}/dimension/dimension ${dimension_flags} -w768 -h480 -o demo.png ${srcdir}/demo.pov diff --git a/tests/dimension/directives.sh b/tests/dimension/directives.sh index 8e3374b..7c66263 100755 --- a/tests/dimension/directives.sh +++ b/tests/dimension/directives.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -directives=$(${top_builddir}/dimension/dimension --strict --tokenize --parse ${srcdir}/directives.pov) +directives=$(${top_builddir}/dimension/dimension ${dimension_flags} --tokenize --parse ${srcdir}/directives.pov) directives_exp="$(echo -n \ '(#version (float "3.6") ; #debug (string "debug") diff --git a/tests/dimension/integer-overflow.sh b/tests/dimension/integer-overflow.sh index 02fb833..0e1f03e 100755 --- a/tests/dimension/integer-overflow.sh +++ b/tests/dimension/integer-overflow.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -integer_overflow=$(${top_builddir}/dimension/dimension --strict --parse ${srcdir}/integer-overflow.pov) +integer_overflow=$(${top_builddir}/dimension/dimension ${dimension_flags} --parse ${srcdir}/integer-overflow.pov) integer_overflow_exp="$(echo -n \ '((object (torus diff --git a/tests/dimension/invalid-macro.sh b/tests/dimension/invalid-macro.sh index a51917a..cf6f353 100755 --- a/tests/dimension/invalid-macro.sh +++ b/tests/dimension/invalid-macro.sh @@ -19,5 +19,5 @@ # along with this program. If not, see . # ######################################################################### -${top_builddir}/dimension/dimension --strict --parse ${srcdir}/invalid-macro.pov +${top_builddir}/dimension/dimension ${dimension_flags} --parse ${srcdir}/invalid-macro.pov [ $? -lt 128 -a $? -gt 0 ] diff --git a/tests/dimension/labels.sh b/tests/dimension/labels.sh index 659b7e1..47365bd 100755 --- a/tests/dimension/labels.sh +++ b/tests/dimension/labels.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -labels=$(${top_builddir}/dimension/dimension --strict --tokenize ${srcdir}/labels.pov) +labels=$(${top_builddir}/dimension/dimension ${dimension_flags} --tokenize ${srcdir}/labels.pov) labels_exp='(camera { } sphere { color (identifier "new_identifier") } box { color (identifier "new_identifier") })'; if [ "$labels" != "$labels_exp" ]; then diff --git a/tests/dimension/numeric.sh b/tests/dimension/numeric.sh index d0ebc7a..c5e7c93 100755 --- a/tests/dimension/numeric.sh +++ b/tests/dimension/numeric.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -numeric=$(${top_builddir}/dimension/dimension --strict --tokenize ${srcdir}/numeric.pov) +numeric=$(${top_builddir}/dimension/dimension ${dimension_flags} --tokenize ${srcdir}/numeric.pov) numeric_exp=$(echo -n \ '((integer "1") (integer "123456789") diff --git a/tests/dimension/punctuation.sh b/tests/dimension/punctuation.sh index 0437a3a..6990657 100755 --- a/tests/dimension/punctuation.sh +++ b/tests/dimension/punctuation.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -punctuation=$(${top_builddir}/dimension/dimension --strict --tokenize ${srcdir}/punctuation.pov) +punctuation=$(${top_builddir}/dimension/dimension ${dimension_flags} --tokenize ${srcdir}/punctuation.pov) punctuation_exp='({ } \( \) [ ] + - * / , ; ? : & . | = < > ! <= >= !=)' if [ "$punctuation" != "$punctuation_exp" ]; then diff --git a/tests/dimension/strings.sh b/tests/dimension/strings.sh index 55e38ad..1f5f4f9 100755 --- a/tests/dimension/strings.sh +++ b/tests/dimension/strings.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -strings=$(${top_builddir}/dimension/dimension --strict --tokenize ${srcdir}/strings.pov) +strings=$(${top_builddir}/dimension/dimension ${dimension_flags} --tokenize ${srcdir}/strings.pov) strings_exp=$(/bin/echo -e "((string \"This is a string with escape sequences: \a\b\f\n\r\t!#\v\\\'\"\"))") if [ "$strings" != "$strings_exp" ]; then diff --git a/tests/dimension/tbuffer-overlap.sh b/tests/dimension/tbuffer-overlap.sh index d004229..bc3126d 100755 --- a/tests/dimension/tbuffer-overlap.sh +++ b/tests/dimension/tbuffer-overlap.sh @@ -19,5 +19,5 @@ # along with this program. If not, see . # ######################################################################### -${top_builddir}/dimension/dimension --strict --parse ${srcdir}/tbuffer-overlap.pov +${top_builddir}/dimension/dimension ${dimension_flags} --parse ${srcdir}/tbuffer-overlap.pov [ $? -lt 128 -a $? -gt 0 ] diff --git a/tests/dimension/transformations.sh b/tests/dimension/transformations.sh index 8a14bc7..727bf3b 100755 --- a/tests/dimension/transformations.sh +++ b/tests/dimension/transformations.sh @@ -19,7 +19,7 @@ # along with this program. If not, see . # ######################################################################### -transformations=$(${top_builddir}/dimension/dimension --strict --parse ${srcdir}/transformations.pov) +transformations=$(${top_builddir}/dimension/dimension ${dimension_flags} --parse ${srcdir}/transformations.pov) transformations_exp="$(echo -n \ '((object (sphere @@ -61,4 +61,4 @@ if [ "$transformations" != "$transformations_exp" ]; then exit 1 fi -${top_builddir}/dimension/dimension --strict -w1 -h1 -o /dev/null ${srcdir}/transformations.pov +${top_builddir}/dimension/dimension ${dimension_flags} -w1 -h1 -o /dev/null ${srcdir}/transformations.pov -- cgit v1.2.3