[Plplot-cvs] SF.net SVN: plplot:[10733] trunk/plplot_test

[<ai...@us...>]

Revision: 10733
          http://plplot.svn.sourceforge.net/plplot/?rev=10733&view=rev
Author:   airwin
Date:     2010-01-04 00:16:18 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
Quote all directory variables to help allow embedded blanks in directory names.

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_c_interactive.sh.in
    trunk/plplot_test/test_cxx.sh.in
    trunk/plplot_test/test_d.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_lua.sh.in
    trunk/plplot_test/test_ocaml.sh.in
    trunk/plplot_test/test_octave.sh.in
    trunk/plplot_test/test_pdl.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	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/plplot-test.sh.cmake	2010-01-04 00:16:18 UTC (rev 10733)
@@ -155,7 +155,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 [ ! -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
@@ -170,7 +170,7 @@
 if [ "@WIN32@" = "1" ] ; then
    scripts_dir=${0%/*}
 else
-   scripts_dir=`echo $0 | sed 's:/[^/][^/]*$::'`
+   scripts_dir=`echo "$0" | sed 's:/[^/][^/]*$::'`
 fi
 
 if [ "$interactive" = "on" ] ; then
@@ -207,44 +207,44 @@
     fi
 
     status=0
-    export cdir=$EXAMPLES_DIR/c
+    export cdir="$EXAMPLES_DIR"/c
     echo "Testing subset of C examples for device $device"
-    script=$scripts_dir/test_c_interactive.sh
+    script="$scripts_dir"/test_c_interactive.sh
     if [ "@WIN32@" != "1" ] ; then
-	chmod +x $script
+	chmod +x "$script"
     fi
-    @SH_EXECUTABLE@ $script || status=1
+    @SH_EXECUTABLE@ "$script" || status=1
 
     exit $status
 fi
 
 # These variables set by default assuming you are going to run this
 # script from the installed demos directory $prefix/lib/plplot$version/examples.
-cdir=$EXAMPLES_DIR/c
-cxxdir=$EXAMPLES_DIR/c++
-f77dir=$EXAMPLES_DIR/f77
-f95dir=$EXAMPLES_DIR/f95
-pythondir=$@CONFIGURED_EXAMPLES_DIR@/python
-tcldir=$@CONFIGURED_EXAMPLES_DIR@/tcl
-perldir=$SRC_EXAMPLES_DIR/perl
-javadir=$EXAMPLES_DIR/java
-adadir=$EXAMPLES_DIR/ada
-ocamldir=$EXAMPLES_DIR/ocaml
-luadir=$@CONFIGURED_EXAMPLES_DIR@/lua
-ddir=$EXAMPLES_DIR/d
+cdir="$EXAMPLES_DIR"/c
+cxxdir="$EXAMPLES_DIR"/c++
+f77dir="$EXAMPLES_DIR"/f77
+f95dir="$EXAMPLES_DIR"/f95
+pythondir="$@CONFIGURED_EXAMPLES_DIR@"/python
+tcldir="$@CONFIGURED_EXAMPLES_DIR@"/tcl
+perldir="$SRC_EXAMPLES_DIR"/perl
+javadir="$EXAMPLES_DIR"/java
+adadir="$EXAMPLES_DIR"/ada
+ocamldir="$EXAMPLES_DIR"/ocaml
+luadir="$@CONFIGURED_EXAMPLES_DIR@"/lua
+ddir="$EXAMPLES_DIR"/d
 octave=@OCTAVE@
 octavedir=\
-$EXAMPLES_DIR/../bindings/octave:\
-$SRC_EXAMPLES_DIR/../bindings/octave/PLplot:\
-$SRC_EXAMPLES_DIR/../bindings/octave/PLplot/support:\
-$SRC_EXAMPLES_DIR/../bindings/octave/demos:\
-$SRC_EXAMPLES_DIR/../bindings/octave/misc:\
-$SRC_EXAMPLES_DIR/octave:\
-@PLPLOT_OCTAVE_DIR@:\
-@PLPLOT_OCTAVE_DIR@/support:\
-@OCTAVE_M_DIR@/PLplot:\
-@OCTAVE_OCT_DIR@:
-PATH=$EXAMPLES_DIR/../utils:@BIN_DIR@:$PATH
+"$EXAMPLES_DIR"/../bindings/octave:\
+"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot:\
+"$SRC_EXAMPLES_DIR"/../bindings/octave/PLplot/support:\
+"$SRC_EXAMPLES_DIR"/../bindings/octave/demos:\
+"$SRC_EXAMPLES_DIR"/../bindings/octave/misc:\
+"$SRC_EXAMPLES_DIR"/octave:\
+"@PLPLOT_OCTAVE_DIR@":\
+"@PLPLOT_OCTAVE_DIR@"/support:\
+"@OCTAVE_M_DIR@"/PLplot:\
+"@OCTAVE_OCT_DIR@":
+PATH="$EXAMPLES_DIR"/../utils:"@BIN_DIR@":"$PATH"
 export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir PATH
 
 fe=""
@@ -382,11 +382,11 @@
 export critical_examples exesuffix
 for i in $FRONT_END ; do
    echo "Testing front-end $i"
-   script=$scripts_dir/test_$i.sh
+   script="$scripts_dir"/test_$i.sh
    if [ "@WIN32@" != "1" ] ; then
-      chmod +x $script
+      chmod +x "$script"
    fi
-   @SH_EXECUTABLE@ $script || status=1
+   @SH_EXECUTABLE@ "$script" || status=1
 done
 
 exit $status

Modified: trunk/plplot_test/test_ada.sh.in
===================================================================
--- trunk/plplot_test/test_ada.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_ada.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -40,12 +40,12 @@
 	echo "x${index}"
     fi
     if [ "$index" = "14" -o "$index" = "thick14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$adadir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	"$adadir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	$adadir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	"$adadir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error

Modified: trunk/plplot_test/test_c.sh.in
===================================================================
--- trunk/plplot_test/test_c.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_c.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -35,14 +35,14 @@
 	echo "x${index}${lang}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$DEBUG_CMD $cdir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	$DEBUG_CMD "$cdir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     else
-	$DEBUG_CMD $cdir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	$DEBUG_CMD "$cdir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     fi

Modified: trunk/plplot_test/test_c_interactive.sh.in
===================================================================
--- trunk/plplot_test/test_c_interactive.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_c_interactive.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -31,7 +31,7 @@
 	echo "x${index}${lang}"
     fi
     $DEBUG_CMD $cdir/x${index}${lang} -dev $device \
-	2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${device}.txt
+	2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${device}.txt
     # Look for any status codes (segfaults, plexit) from the examples
     # themselves.
     status_code=$?

Modified: trunk/plplot_test/test_cxx.sh.in
===================================================================
--- trunk/plplot_test/test_cxx.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_cxx.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -33,7 +33,7 @@
 # x01cc is a C++ alternative that has no corresponding examples for the
 # other front ends.
 index=01c
-$DEBUG_CMD $cxxdir/x01cc${exesuffix} -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options
+$DEBUG_CMD "$cxxdir"/x01cc${exesuffix} -dev $device -o "${OUTPUT_DIR}"/x01cc%n.$dsuffix $options
 
 # Do the standard non-interactive examples.
 for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \
@@ -42,12 +42,12 @@
 	echo "x${index}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$DEBUG_CMD $cxxdir/x${index}${exesuffix} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	$DEBUG_CMD "$cxxdir"/x${index}${exesuffix} -dev $device -o "${OUTPUT_DIR}"/x${index}cxx%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	$DEBUG_CMD $cxxdir/x${index}${exesuffix} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	$DEBUG_CMD "$cxxdir"/x${index}${exesuffix} -dev $device -o "${OUTPUT_DIR}"/x${index}cxx%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error

Modified: trunk/plplot_test/test_d.sh.in
===================================================================
--- trunk/plplot_test/test_d.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_d.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -36,14 +36,14 @@
 	echo "x${index}${lang}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$DEBUG_CMD $ddir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	$DEBUG_CMD "$ddir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     else
-	$DEBUG_CMD $ddir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	$DEBUG_CMD "$ddir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     fi

Modified: trunk/plplot_test/test_f77.sh.in
===================================================================
--- trunk/plplot_test/test_f77.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_f77.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -40,7 +40,7 @@
 	echo "x16af"
     fi
     index="16a"
-    $DEBUG_CMD $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af%n.$dsuffix $options 2> test.error
+    $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
@@ -59,12 +59,12 @@
 	    echo "x${index}f"
 	fi
 	if [ "${index}" = "14" ] ; then
-	    echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	    $DEBUG_CMD $f77dir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	    echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	    $DEBUG_CMD "$f77dir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
       status_code=$?
 	else
-	    $DEBUG_CMD $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	    $DEBUG_CMD "$f77dir"/x${index}f -dev $device -o "${OUTPUT_DIR}"/x${index}f%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	    status_code=$?
 	fi
 	cat test.error
@@ -88,9 +88,9 @@
     if [ "$verbose_test" ] ; then
 	echo "x16af"
     fi
-    $DEBUG_CMD $f77dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+    $DEBUG_CMD "$f77dir"/x16af <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x16af%n.$dsuffix 
+"${OUTPUT_DIR}"/x16af%n.$dsuffix 
 EOF
   status_code=$?
   cat test.error
@@ -111,17 +111,17 @@
 	  echo "x${index}f"
       fi
       if [ "$index" = "14" ] ; then
-	  $DEBUG_CMD $f77dir/x${index}f <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	  $DEBUG_CMD "$f77dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x${index}f%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}f%n.$dsuffix
 $device
-${OUTPUT_DIR}/x${index}af%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}af%n.$dsuffix
 EOF
 	  status_code=$?
       else
-	  $DEBUG_CMD $f77dir/x${index}f <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	  $DEBUG_CMD "$f77dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x${index}f%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}f%n.$dsuffix
 EOF
 	  status_code=$?
       fi

Modified: trunk/plplot_test/test_f95.sh.in
===================================================================
--- trunk/plplot_test/test_f95.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_f95.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -40,7 +40,7 @@
     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
+    $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
@@ -60,12 +60,12 @@
 	    echo "x${index}f"
 	fi
 	if [ "${index}" = "14" ] ; then
-	    echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	    $DEBUG_CMD $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-      $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	    echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	    $DEBUG_CMD "$f95dir"/x${index}f -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+      $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
       status_code=$?
 	else
-	    $DEBUG_CMD $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	    $DEBUG_CMD "$f95dir"/x${index}f -dev $device -o "${OUTPUT_DIR}"/x${index}f95%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	    status_code=$?
 	fi
 	cat test.error
@@ -88,9 +88,9 @@
     if [ "$verbose_test" ] ; then
 	echo "x16af"
     fi
-    $DEBUG_CMD $f95dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+    $DEBUG_CMD "$f95dir"/x16af <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x16af95%n.$dsuffix
+"${OUTPUT_DIR}"/x16af95%n.$dsuffix
 EOF
   status_code=$?
   cat test.error
@@ -111,17 +111,17 @@
 	  echo "x${index}f"
       fi
       if [ "${index}" = "14" ] ; then
-	  $DEBUG_CMD $f95dir/x${index}f <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	  $DEBUG_CMD "$f95dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x${index}f95%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}f95%n.$dsuffix
 $device
-${OUTPUT_DIR}/x${index}af95%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}af95%n.$dsuffix
 EOF
 	  status_code=$?
       else
-	  $DEBUG_CMD $f95dir/x${index}f <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	  $DEBUG_CMD "$f95dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 $device
-${OUTPUT_DIR}/x${index}f95%n.$dsuffix
+"${OUTPUT_DIR}"/x${index}f95%n.$dsuffix
 EOF
 	  status_code=$?
       fi

Modified: trunk/plplot_test/test_java.sh.in
===================================================================
--- trunk/plplot_test/test_java.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_java.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -38,10 +38,10 @@
     JAVA_TEST_OPTS="-Dplplot.libdir=$PLPLOT_JAVA_WRAP_DIR"
 fi
 if [ -z "$PLPLOT_CLASSPATH" ] ; then
-    PLPLOT_CLASSPATH=@JAVADATA_HARDDIR@/plplot.jar
+    PLPLOT_CLASSPATH="@JAVADATA_HARDDIR@"/plplot.jar
 fi
 if [ "@WIN32@" != "1" ]; then
-    PLPLOT_CLASSPATH=${javadir}:${PLPLOT_CLASSPATH}
+    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 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ; do
@@ -49,12 +49,12 @@
 	echo "x${index}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	java -classpath ${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	$options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	java -classpath "${PLPLOT_CLASSPATH}" "${JAVA_TEST_OPTS}" plplot.examples.x${index} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	$options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	java -classpath ${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	java -classpath "${PLPLOT_CLASSPATH}" "${JAVA_TEST_OPTS}" plplot.examples.x${index} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error

Modified: trunk/plplot_test/test_lua.sh.in
===================================================================
--- trunk/plplot_test/test_lua.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_lua.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -25,24 +25,24 @@
 # Do the standard non-interactive examples.
 lang="lua"
 # Lua examples must be run from the directory where they exist.
-cd $OUTPUT_DIR
-results=`pwd`
+cd "${OUTPUT_DIR}"
+results="`pwd`"
 export results
-echo $results
-cd $luadir
+echo "$results"
+cd "$luadir"
 for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do
     if [ "$verbose_test" ] ; then
 	echo "x${index}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${results}/x${index}a${lang}%n.$dsuffix | \
-	@LUA_EXECUTABLE@ x${index}.${lang} -dev $device -o ${results}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt
+	echo "${results}"/x${index}a${lang}%n.$dsuffix | \
+	@LUA_EXECUTABLE@ x${index}.${lang} -dev $device -o "${results}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${results}"/x${index}${lang}_${dsuffix}.txt
 	# Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     else
-	@LUA_EXECUTABLE@ x${index}.${lang} -dev $device -o ${results}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt
+	@LUA_EXECUTABLE@ x${index}.${lang} -dev $device -o "${results}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${results}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     fi

Modified: trunk/plplot_test/test_ocaml.sh.in
===================================================================
--- trunk/plplot_test/test_ocaml.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_ocaml.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -29,14 +29,14 @@
 	echo "x${index}ocaml"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$ocamldir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	"$ocamldir"/x${index}${lang} -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	# Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     else
-	$ocamldir/x${index}ocaml -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	"$ocamldir"/x${index}ocaml -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
     # Look for any status codes (segfaults, plexit) from the examples themselves.
 	status_code=$?
     fi

Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_octave.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -29,11 +29,11 @@
 lang="o"
 export lang
 TOPDIR=`pwd`/..
-echo $TOPDIR
-export LD_LIBRARY_PATH=$TOPDIR/src:$TOPDIR/lib/csa:$TOPDIR/lib/nn
+echo "$TOPDIR"
+export LD_LIBRARY_PATH="$TOPDIR"/src:"$TOPDIR"/lib/csa:"$TOPDIR"/lib/nn
 
 # Launch an Octave script that exercises all the demos
-$octave -f -q -p $octavedir <<EOF 2> test.error
+$octave -f -q -p "$octavedir" <<EOF 2> test.error
 
 # Check verbose_test variable
 if (strcmp(getenv("verbose_test"),"on") == 1)

Modified: trunk/plplot_test/test_pdl.sh.in
===================================================================
--- trunk/plplot_test/test_pdl.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_pdl.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -31,9 +31,9 @@
 # tree and install tree.
 lang="pdl"
 if [ "$LD_LIBRARY_PATH" = "" ] ; then
-    export LD_LIBRARY_PATH=../src:@LIB_DIR@
+    export LD_LIBRARY_PATH=../src:"@LIB_DIR@"
 else
-    export LD_LIBRARY_PATH=../src:@LIB_DIR@:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=../src:"@LIB_DIR@":$LD_LIBRARY_PATH
 fi
 
 if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" = "ON" ] ; then
@@ -49,12 +49,12 @@
 	echo "x${index}.pl"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	"$perldir"/x${index}.pl -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	$perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	"$perldir"/x${index}.pl -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error

Modified: trunk/plplot_test/test_python.sh.in
===================================================================
--- trunk/plplot_test/test_python.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_python.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -35,12 +35,12 @@
 	echo "x${index}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	@PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+	echo "${OUTPUT_DIR}"/x${index}a${lang}%n.$dsuffix | \
+	@PYTHON_EXECUTABLE@ "$pythondir"/x$index -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	@PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt 
+	@PYTHON_EXECUTABLE@ "$pythondir"/x$index -dev $device -o "${OUTPUT_DIR}"/x${index}${lang}%n.$dsuffix $options 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt 
 	status_code=$?
     fi
     cat test.error

Modified: trunk/plplot_test/test_tcl.sh.in
===================================================================
--- trunk/plplot_test/test_tcl.sh.in	2010-01-02 03:23:14 UTC (rev 10732)
+++ trunk/plplot_test/test_tcl.sh.in	2010-01-04 00:16:18 UTC (rev 10733)
@@ -24,14 +24,14 @@
 # This is called from plplot-test.sh with $tcldir, $device, $dsuffix,
 # $options, and possibly $verbose_test defined.
 lang="t"
-cd $OUTPUT_DIR
-results=`pwd`
+cd "${OUTPUT_DIR}"
+results="`pwd`"
 export results
-cd $tcldir
+cd "$tcldir"
 if [ "$verbose_test" ] ; then
     echo "pltcl demo of plot"
 fi
-pltcl -dev $device -o $results/plot%n.$dsuffix $options <<EOF 2> test.error
+pltcl -dev $device -o "$results"/plot%n.$dsuffix $options <<EOF 2> test.error
 plinit
 source plot.tcl
 plot stats.log {1 4}
@@ -54,7 +54,7 @@
 if [ "$verbose_test" ] ; then
     echo "pltcl demo of plgrid"
 fi
-pltcl -dev $device -o $results/plgrid%n.$dsuffix $options <<EOF 2> test.error
+pltcl -dev $device -o "$results"/plgrid%n.$dsuffix $options <<EOF 2> test.error
 plinit
 source plgrid.tcl
 plgrid
@@ -76,12 +76,12 @@
 	echo "x${index}"
     fi
     if [ "$index" = "14" ] ; then
-	echo ${results}/x${index}a${lang}%n.$dsuffix | \
-	./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix \
-	    $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt
+	echo "${results}"/x${index}a${lang}%n.$dsuffix | \
+	./x${index} -dev $device -o "$results"/x${index}${lang}%n.$dsuffix \
+	    $options 2> test.error >| "${results}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     else
-	./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt
+	./x${index} -dev $device -o "$results"/x${index}${lang}%n.$dsuffix $options 2> test.error >| "${results}"/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.