|
From: <ai...@us...> - 2009-01-06 19:34:15
|
Revision: 9264
http://plplot.svn.sourceforge.net/plplot/?rev=9264&view=rev
Author: airwin
Date: 2009-01-06 19:34:14 +0000 (Tue, 06 Jan 2009)
Log Message:
-----------
Make "if" syntax more consistent. [ ] preferred to test, string comparisons
done with "=" rather than "==" (already taken care of by recent Andrew Ross
commit), and uniformly apply quotes to second argument of string comparison.
Modified Paths:
--------------
trunk/plplot_test/plplot-test.sh.cmake
trunk/plplot_test/test_ada.sh.in
trunk/plplot_test/test_c.sh.in
trunk/plplot_test/test_cxx.sh.in
trunk/plplot_test/test_f77.sh.in
trunk/plplot_test/test_f95.sh.in
trunk/plplot_test/test_java.sh.in
trunk/plplot_test/test_ocaml.sh.in
trunk/plplot_test/test_octave.sh.in
trunk/plplot_test/test_perl.sh.in
trunk/plplot_test/test_python.sh.in
trunk/plplot_test/test_tcl.sh.in
Modified: trunk/plplot_test/plplot-test.sh.cmake
===================================================================
--- trunk/plplot_test/plplot-test.sh.cmake 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/plplot-test.sh.cmake 2009-01-06 19:34:14 UTC (rev 9264)
@@ -77,7 +77,7 @@
}
while test $# -gt 0; do
- if test "@HAVE_BASH@" = ON ; then
+ if [ "@HAVE_BASH@" = "ON" ] ; then
case "$1" in
-*=*) optarg=${1#*=} ;;
*) optarg= ;;
@@ -103,18 +103,19 @@
--front-end=*)
FRONT_END=$optarg
for i in $FRONT_END ; do
- test $i = "c" \
- -o $i = "cxx" \
- -o $i = "f77" \
- -o $i = "f95" \
- -o $i = "java" \
- -o $i = "octave" \
- -o $i = "python" \
- -o $i = "tcl" \
- -o $i = "perl" \
- -o $i = "ada" \
- -o $i = "ocaml" \
- || usage 0 1>&2
+ [ $i = "c" \
+ -o $i = "cxx" \
+ -o $i = "f77" \
+ -o $i = "f95" \
+ -o $i = "java" \
+ -o $i = "octave" \
+ -o $i = "python" \
+ -o $i = "tcl" \
+ -o $i = "perl" \
+ -o $i = "ada" \
+ -o $i = "ocaml" \
+ ] \
+ || usage 0 1>&2
done
;;
--examples-dir=*)
@@ -145,7 +146,7 @@
# This script is only designed to work when EXAMPLES_DIR is a directory
# with a subdirectory called "c". Check whether this conditions is true.
-if test ! -d $EXAMPLES_DIR/c ; then
+if [ ! -d $EXAMPLES_DIR/c ] ; then
echo '
This script is only designed to work when the EXAMPLES_DIR environment
variable (overridden by option --examples-dir) is a directory with a
@@ -241,7 +242,7 @@
#interactive PLD_xwin=@PLD_xwin@
eval pld_device='$'PLD_$device
-if test -z "$pld_device" ; then
+if [ -z "$pld_device" ] ; then
echo '
Never heard of a file device called '"$device"'. Either this is not a
legitimate file (i.e. non-interactive) device for PLplot or else
@@ -251,7 +252,7 @@
exit 1
fi
-if test ! "$pld_device" = ON; then
+if [ ! "$pld_device" = "ON" ] ; then
echo '
PLD_'"$device"' is defined as '"$pld_device"'. It must be ON (i.e., enabled
by your cmake configuration and built properly) before you can use this
@@ -279,24 +280,24 @@
export dsuffix options
# Find out what front-ends have been configured
-if test -z "$FRONT_END" ; then
+if [ -z "$FRONT_END" ] ; then
FRONT_END=c
- test "@ENABLE_cxx@" = ON && FRONT_END="$FRONT_END cxx"
- test "@ENABLE_f77@" = ON && FRONT_END="$FRONT_END f77"
- test "@ENABLE_f95@" = ON && FRONT_END="$FRONT_END f95"
- test "@ENABLE_java@" = ON && FRONT_END="$FRONT_END java"
- test "@ENABLE_octave@" = ON && FRONT_END="$FRONT_END octave"
- test "@ENABLE_python@" = ON && FRONT_END="$FRONT_END python"
- test "@ENABLE_tcl@" = ON && FRONT_END="$FRONT_END tcl"
- test "@ENABLE_pdl@" = ON && FRONT_END="$FRONT_END perl"
- test "@ENABLE_ada@" = ON && FRONT_END="$FRONT_END ada"
- test "@ENABLE_ocaml@" = ON && FRONT_END="$FRONT_END ocaml"
+ test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx"
+ test "@ENABLE_f77@" = "ON" && FRONT_END="$FRONT_END f77"
+ test "@ENABLE_f95@" = "ON" && FRONT_END="$FRONT_END f95"
+ test "@ENABLE_java@" = "ON" && FRONT_END="$FRONT_END java"
+ test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave"
+ test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python"
+ test "@ENABLE_tcl@" = "ON" && FRONT_END="$FRONT_END tcl"
+ test "@ENABLE_pdl@" = "ON" && FRONT_END="$FRONT_END perl"
+ test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada"
+ test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml"
fi
# Find where the front-end scripts are by looking at the directory name of the
# current script.
-if test "@WIN32@" = "1"; then
+if [ "@WIN32@" = "1" ] ; then
scripts_dir=${0%/*}
else
scripts_dir=`echo $0 | sed 's:/[^/][^/]*$::'`
@@ -308,7 +309,7 @@
for i in $FRONT_END ; do
echo "Testing front-end $i"
script=$scripts_dir/test_$i.sh
- if test "@WIN32@" != "1"; then
+ if [ "@WIN32@" != "1" ] ; then
chmod +x $script
fi
@SH_EXECUTABLE@ $script || status=1
Modified: trunk/plplot_test/test_ada.sh.in
===================================================================
--- trunk/plplot_test/test_ada.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_ada.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -36,7 +36,7 @@
thick01 thick02 thick03 thick04 thick05 thick06 thick07 thick08 thick09 \
thick10 thick11 thick12 thick13 thick14 thick15 thick16 thick18 thick19 thick20 \
thick21 thick22 thick23 thick24 thick25 thick26 thick27 thick28 thick29 thick30 thick31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}"
fi
if [ "$index" = "14" -o "$index" = "thick14" ] ; then
@@ -49,13 +49,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_c.sh.in
===================================================================
--- trunk/plplot_test/test_c.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_c.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -32,7 +32,7 @@
export index lang
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 \
21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}${lang}"
fi
if [ "$index" = "14" ] ; then
@@ -49,13 +49,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_cxx.sh.in
===================================================================
--- trunk/plplot_test/test_cxx.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_cxx.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -38,7 +38,7 @@
# Do the standard non-interactive examples.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}"
fi
if [ "$index" = "14" ] ; then
@@ -51,13 +51,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_f77.sh.in
===================================================================
--- trunk/plplot_test/test_f77.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_f77.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -28,7 +28,7 @@
lang="f"
export index lang
-if test "yes@HAVE_F77PARSE_CL_TRUE@" = "yes"; then
+if [ "yes@HAVE_F77PARSE_CL_TRUE@" = "yes" ] ; then
# This stanza only works if fortran has command-line parsing capability.
# However, this is the preferred method because it allows access to
# command-line parsing of the $options (e.g., familying options for png
@@ -36,27 +36,27 @@
# Do non-standard example 16a because it illustrates plshade functionality
# with cmap1 (and also because the result looks nice.)
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x16af"
fi
index="16a"
$DEBUG_CMD $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af%n.$dsuffix $options 2> test.error
status_code=$?
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [-n "$is_error" ] ; then
exit 1
fi
# Do the standard non-interactive examples.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}f"
fi
if [ "${index}" = "14" ] ; then
@@ -69,13 +69,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
@@ -86,7 +86,7 @@
# for this method.
# Do non-standard example 16a because it illustrates plshade functionality
# with cmap1 (and also because the result looks nice.)
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x16af"
fi
$DEBUG_CMD $f77dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
@@ -95,20 +95,20 @@
EOF
status_code=$?
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
# Do the standard non-interactive examples.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}f"
fi
if [ "$index" = "14" ] ; then
@@ -127,13 +127,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
Modified: trunk/plplot_test/test_f95.sh.in
===================================================================
--- trunk/plplot_test/test_f95.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_f95.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -29,7 +29,7 @@
lang="f95"
export index lang
-if test "yes@HAVE_F77PARSE_CL_TRUE@" = "yes"; then
+if [ "yes@HAVE_F77PARSE_CL_TRUE@" = "yes" ] ; then
# This stanza only works if fortran has command-line parsing capability.
# However, this is the preferred method because it allows access to
# command-line parsing of the $options (e.g., familying options for png
@@ -37,19 +37,19 @@
# Do non-standard example 16a because it illustrates plshade functionality
# with cmap1 (and also because the result looks nice.)
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x16af"
fi
$DEBUG_CMD $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
status_code=$?
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
@@ -57,7 +57,7 @@
# Do the standard non-interactive examples.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}f"
fi
if [ "${index}" = "14" ] ; then
@@ -70,13 +70,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
@@ -86,7 +86,7 @@
# for this method.
# Do non-standard example 16a because it illustrates plshade functionality
# with cmap1 (and also because the result looks nice.)
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x16af"
fi
$DEBUG_CMD $f95dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
@@ -95,13 +95,13 @@
EOF
status_code=$?
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
@@ -109,7 +109,7 @@
# Do the standard non-interactive examples.
# skip 17 because it is interactive.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}f"
fi
if [ "${index}" = "14" ] ; then
@@ -128,13 +128,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_java.sh.in
===================================================================
--- trunk/plplot_test/test_java.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_java.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -36,18 +36,18 @@
#
# Set up option to point to java bindings jar file and wrapper if needed.
lang="j"
-if test -n "$PLPLOT_JAVA_WRAP_DIR" ; then
+if [ -n "$PLPLOT_JAVA_WRAP_DIR" ]; then
JAVA_TEST_OPTS="-Dplplot.libdir=$PLPLOT_JAVA_WRAP_DIR"
fi
-if test -z "$PLPLOT_CLASSPATH" ; then
+if [ -z "$PLPLOT_CLASSPATH" ] ; then
PLPLOT_CLASSPATH=@JAVADATA_HARDDIR@/plplot.jar
fi
-if test "@WIN32@" != "1" ; then
+if [ "@WIN32@" != "1" ]; then
PLPLOT_CLASSPATH=${javadir}:${PLPLOT_CLASSPATH}
fi
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 20 21 22 23 24 25 26 27 28 29 30 31 ; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}"
fi
if [ "$index" = "14" ] ; then
@@ -60,13 +60,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
Modified: trunk/plplot_test/test_ocaml.sh.in
===================================================================
--- trunk/plplot_test/test_ocaml.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_ocaml.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -25,7 +25,7 @@
# Do the standard non-interactive examples.
lang="ocaml"
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}ocaml"
fi
if [ "$index" = "14" ] ; then
@@ -42,13 +42,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_octave.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -62,7 +62,7 @@
# These require octave-2.1.50 so comment out since not everybody has
# this.
- for i=[1:7 8 9 13 15 16];
+ for i=[1:7 8 9 13 15 16] ;
if (verbose_test)
printf("p%d\n",i);
endif
@@ -74,8 +74,8 @@
#For file output 17 is not suitable, and 19 is not done
#(and should probably be dropped anyway since the map stuff is not
#in the API that is supposed to be common to all front ends.)
- failed = [];
- for i=[1:16 18 20:31 ];
+ failed = [] ;
+ for i=[1:16 18 20:31 ] ;
ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i);
strm = fopen(ofile,"w");
cmd = sprintf("x%.2dc",i);
@@ -98,7 +98,7 @@
if i == 14
file2 = sprintf("${OUTPUT_DIR}/x%.2da${lang}.${dsuffix}",i);
endif
- eval(cmd, "failed = [failed, i];");
+ eval(cmd, "failed = [failed, i] ;");
fclose(strm);
clear file2;
endfor
@@ -114,14 +114,14 @@
exit (1);
endif
EOF
- status_code=$?
- cat test.error
- if [ "$status_code" -ne 0 ]; then
- exit $status_code
- fi
+status_code=$?
+cat test.error
+if [ "$status_code" -ne 0 ] ; then
+ exit $status_code
+fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
- is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
- exit 1
- fi
+is_error=`grep -l 'PLPLOT ERROR' test.error`
+if [-n "$is_error" ] ; then
+ exit 1
+fi
Modified: trunk/plplot_test/test_perl.sh.in
===================================================================
--- trunk/plplot_test/test_perl.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_perl.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -46,7 +46,7 @@
fi
for index in $INDEX_LIST ; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}.pl"
fi
if [ "$index" = "14" ] ; then
@@ -59,13 +59,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_python.sh.in
===================================================================
--- trunk/plplot_test/test_python.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_python.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -33,7 +33,7 @@
lang="p"
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 \
20 22 23 24 25 26 27 28 29 30 31 @NUMPY_EXAMPLES@ ; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}"
fi
if [ "$index" = "14" ] ; then
@@ -46,13 +46,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
Modified: trunk/plplot_test/test_tcl.sh.in
===================================================================
--- trunk/plplot_test/test_tcl.sh.in 2009-01-06 18:05:51 UTC (rev 9263)
+++ trunk/plplot_test/test_tcl.sh.in 2009-01-06 19:34:14 UTC (rev 9264)
@@ -28,7 +28,7 @@
results=`pwd`
export results
cd $tcldir
-if [ "$verbose_test" ]; then
+if [ "$verbose_test" ] ; then
echo "pltcl demo of plot"
fi
pltcl -dev $device -o $results/plot%n.$dsuffix $options <<EOF 2> test.error
@@ -42,16 +42,16 @@
EOF
status_code=$?
cat test.error
-if [ "$status_code" -ne 0 ]; then
+if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
-if test -n "$is_error"; then
+if [ -n "$is_error" ] ; then
exit 1
fi
-if [ "$verbose_test" ]; then
+if [ "$verbose_test" ] ; then
echo "pltcl demo of plgrid"
fi
pltcl -dev $device -o $results/plgrid%n.$dsuffix $options <<EOF 2> test.error
@@ -62,20 +62,20 @@
EOF
status_code=$?
cat test.error
-if [ "$status_code" -ne 0 ]; then
+if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
-if test -n "$is_error"; then
+if [ -n "$is_error" ] ; then
exit 1
fi
# Skip 17th example because it is not implemented (and if it was, it
# would be interactive only).
# Other examples are not yet implemented.
for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 20 21 22 23 24 25 26 27 28 29 30 31; do
- if [ "$verbose_test" ]; then
+ if [ "$verbose_test" ] ; then
echo "x${index}"
fi
if [ "$index" = "14" ] ; then
@@ -88,13 +88,13 @@
status_code=$?
fi
cat test.error
- if [ "$status_code" -ne 0 ]; then
+ if [ "$status_code" -ne 0 ] ; then
exit $status_code
fi
# Look for any PLPLOT ERROR messages from plwarn that do not result in an
# exit code.
is_error=`grep -l 'PLPLOT ERROR' test.error`
- if test -n "$is_error"; then
+ if [ -n "$is_error" ] ; then
exit 1
fi
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|