From: <ai...@us...> - 2008-08-12 22:21:52
|
Revision: 8636 http://plplot.svn.sourceforge.net/plplot/?rev=8636&view=rev Author: airwin Date: 2008-08-12 22:22:00 +0000 (Tue, 12 Aug 2008) Log Message: ----------- Implement a --verbose option for our C examples as a proof of concept. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_c.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2008-08-12 17:09:44 UTC (rev 8635) +++ trunk/plplot_test/CMakeLists.txt 2008-08-12 22:22:00 UTC (rev 8636) @@ -8,7 +8,8 @@ ) set(TEST_DEVICE psc CACHE STRING "device used for ctest") -set(TEST_SCRIPT "./plplot-test.sh --device=${TEST_DEVICE}") +set(TEST_SCRIPT "./plplot-test.sh --verbose") +set(TEST_SCRIPT_DEVICE "${TEST_SCRIPT} --device=${TEST_DEVICE}") set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar") @@ -21,14 +22,14 @@ configure_file(test_c.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_c.sh @ONLY) set(SCRIPTS test_c.sh) add_test(examples_c - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) if(ENABLE_cxx) configure_file(test_cxx.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_cxx.sh @ONLY) set(SCRIPTS ${SCRIPTS} test_cxx.sh) add_test(examples_cxx - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=cxx" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=cxx" ) endif(ENABLE_cxx) @@ -36,7 +37,7 @@ configure_file(test_f77.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f77.sh @ONLY) set(SCRIPTS ${SCRIPTS} test_f77.sh) add_test(examples_f77 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=f77" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f77" ) endif(ENABLE_f77) @@ -44,7 +45,7 @@ configure_file(test_f95.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_f95.sh @ONLY) set(SCRIPTS ${SCRIPTS} test_f95.sh) add_test(examples_f95 - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=f95" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=f95" ) endif(ENABLE_f95) @@ -56,7 +57,7 @@ ) set(SCRIPTS ${SCRIPTS} test_java.sh) add_test(examples_java - ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=java" + ${SH_EXECUTABLE} -c "${JAVA_TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=java" ) endif(ENABLE_java) @@ -68,7 +69,7 @@ ) set(SCRIPTS ${SCRIPTS} test_octave.sh) add_test(examples_octave - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=octave" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=octave" ) endif(ENABLE_octave) @@ -86,7 +87,7 @@ ) set(SCRIPTS ${SCRIPTS} test_python.sh) add_test(examples_python - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=python" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=python" ) endif(ENABLE_python) @@ -94,7 +95,7 @@ configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY) set(SCRIPTS ${SCRIPTS} test_tcl.sh) add_test(examples_tcl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=tcl" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) endif(ENABLE_tcl) @@ -106,7 +107,7 @@ ) set(SCRIPTS ${SCRIPTS} test_perl.sh) add_test(examples_perl - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=perl" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=perl" ) endif(ENABLE_pdl) @@ -118,7 +119,7 @@ ) set(SCRIPTS ${SCRIPTS} test_ada.sh) add_test(examples_ada - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=ada" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ada" ) endif(ENABLE_ada) @@ -130,7 +131,7 @@ ) set(SCRIPTS ${SCRIPTS} test_ocaml.sh) add_test(examples_ocaml - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=ocaml" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=ocaml" ) endif(ENABLE_ocaml) @@ -138,7 +139,7 @@ if(PLD_psc) if (NOT TEST_DEVICE STREQUAL "psc") add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=psttfc" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" ) endif(NOT TEST_DEVICE STREQUAL "psc") endif(PLD_psc) @@ -146,7 +147,7 @@ if(PLD_psttf) if (NOT TEST_DEVICE STREQUAL "psttfc") add_test(examples_psttfc - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=psttfc" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=psttfc" ) endif(NOT TEST_DEVICE STREQUAL "psttfc") endif(PLD_psttf) @@ -154,7 +155,7 @@ if(PLD_pstex) if (NOT TEST_DEVICE STREQUAL "pstex") add_test(examples_pstex - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=pstex" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pstex" ) endif(NOT TEST_DEVICE STREQUAL "pstex") endif(PLD_pstex) @@ -162,7 +163,7 @@ if(PLD_png) if (NOT TEST_DEVICE STREQUAL "png") add_test(examples_png - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=png" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=png" ) endif(NOT TEST_DEVICE STREQUAL "png") endif(PLD_png) @@ -170,7 +171,7 @@ if(PLD_svg) if (NOT TEST_DEVICE STREQUAL "svg") add_test(examples_svg - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=svg" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=svg" ) endif(NOT TEST_DEVICE STREQUAL "svg") endif(PLD_svg) @@ -178,7 +179,7 @@ if(PLD_plmeta) if (NOT TEST_DEVICE STREQUAL "plmeta") add_test(examples_plmeta - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=plmeta" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=plmeta" ) endif(NOT TEST_DEVICE STREQUAL "plmeta") endif(PLD_plmeta) @@ -186,7 +187,7 @@ if(PLD_pscairo) if (NOT TEST_DEVICE STREQUAL "pscairo") add_test(examples_pscairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=pscairo" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pscairo" ) endif(NOT TEST_DEVICE STREQUAL "pscairo") endif(PLD_pscairo) @@ -194,7 +195,7 @@ if(PLD_pngcairo) if (NOT TEST_DEVICE STREQUAL "pngcairo") add_test(examples_pngcairo - ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ./plplot-test.sh --front-end=c --device=pngcairo" + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pngcairo" ) endif(NOT TEST_DEVICE STREQUAL "pngcairo") endif(PLD_pngcairo) Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2008-08-12 17:09:44 UTC (rev 8635) +++ trunk/plplot_test/plplot-test.sh.cmake 2008-08-12 22:22:00 UTC (rev 8636) @@ -58,6 +58,7 @@ [--output-dir=/path/to/output/dir] Specify location where the resulting files are stored. Defaults to "." + [--verbose] Echo each PLplot example that is executed. [--version] [--help] @@ -89,6 +90,9 @@ --device=*) device=$optarg ;; + --verbose) + export verbose_test=on + ;; --version) echo $version exit 0 Modified: trunk/plplot_test/test_c.sh.in =================================================================== --- trunk/plplot_test/test_c.sh.in 2008-08-12 17:09:44 UTC (rev 8635) +++ trunk/plplot_test/test_c.sh.in 2008-08-12 22:22:00 UTC (rev 8636) @@ -21,7 +21,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $cdir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the c examples before running this script do the following: # pushd $cdir; make; popd @@ -35,6 +35,11 @@ $options 2> test.error # Look for any status codes (segfaults, plexit) from the examples themselves. status_code=$? + if [ "$verbose_test" ]; then + echo -n \ + "$cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c.$dsuffix" + echo "$options 2> test.error" + fi cat test.error if [ "$status_code" -ne 0 ]; then exit $status_code This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-08-13 23:07:18
|
Revision: 8644 http://plplot.svn.sourceforge.net/plplot/?rev=8644&view=rev Author: airwin Date: 2008-08-13 23:07:26 +0000 (Wed, 13 Aug 2008) Log Message: ----------- Implement additional output when verbose mode is on following style in test_c.sh.in. Modified Paths: -------------- trunk/plplot_test/test_ada.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_perl.sh.in trunk/plplot_test/test_python.sh.in trunk/plplot_test/test_tcl.sh.in Modified: trunk/plplot_test/test_ada.sh.in =================================================================== --- trunk/plplot_test/test_ada.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_ada.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -21,7 +21,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $adadir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the Ada examples before running this script do the following: # pushd $adadir; make; popd @@ -36,6 +36,9 @@ thick01 thick02 thick03 thick04 thick05 thick06 thick07 thick08 thick09 \ thick10 thick11 thick12 thick13 thick15 thick16 thick18 thick19 \ thick21 thick22 thick23 thick24 thick25 thick26 thick27 thick28 thick29 thick30; do + if [ "$verbose_test" ]; then + echo "x${index}a" + fi $adadir/x${index}a -dev $device -o ${OUTPUT_DIR}/x${index}a.$dsuffix $options 2> test.error status_code=$? cat test.error Modified: trunk/plplot_test/test_cxx.sh.in =================================================================== --- trunk/plplot_test/test_cxx.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_cxx.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $cxxdir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the c++ examples before running this script do the following: # pushd $cxxdir; make; popd @@ -35,6 +35,9 @@ # skip 14 because it requires two output files. # skip 17 because it is interactive. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30; do + if [ "$verbose_test" ]; then + echo "x${index}" + fi $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx.$dsuffix $options 2> test.error status_code=$? cat test.error Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_f77.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -21,7 +21,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $f77dir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the f77 examples before running this script do the following: # pushd $f77dir; make; popd @@ -34,6 +34,9 @@ # Do non-standard example 16a because it illustrates plshade functionality # with cmap1 (and also because the result looks nice.) + if [ "$verbose_test" ]; then + echo "x16af" + fi $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af.$dsuffix $options 2> test.error status_code=$? cat test.error @@ -50,6 +53,9 @@ # Do the standard non-interactive examples. # skip 14 and 17 because they are interactive. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 ; do + if [ "$verbose_test" ]; then + echo "x${index}f" + fi $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f.$dsuffix $options 2> test.error status_code=$? cat test.error @@ -70,6 +76,9 @@ # 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 + echo "x16af" + fi $f77dir/x16af <<EOF 2> test.error $device ${OUTPUT_DIR}/x16af.$dsuffix @@ -89,6 +98,9 @@ # Do the standard non-interactive examples. # skip 14 and 17 because they are interactive. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 ; do + if [ "$verbose_test" ]; then + echo "x${index}f" + fi $f77dir/x${index}f <<EOF 2> test.error $device ${OUTPUT_DIR}/x${index}f.$dsuffix Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_f95.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -21,7 +21,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $f95dir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the f95 examples before running this script do the following: # pushd $f95dir; make; popd @@ -34,6 +34,9 @@ # Do non-standard example 16a because it illustrates plshade functionality # with cmap1 (and also because the result looks nice.) + if [ "$verbose_test" ]; then + echo "x16af" + fi $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95.$dsuffix $options 2> test.error status_code=$? cat test.error @@ -51,6 +54,9 @@ # Do the standard non-interactive examples. # skip 14 and 17 because they are interactive. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 28 29 30; do + if [ "$verbose_test" ]; then + echo "x${index}f" + fi $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95.$dsuffix $options 2> test.error status_code=$? cat test.error @@ -70,6 +76,9 @@ # 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 + echo "x16af" + fi $f95dir/x16af <<EOF 2> test.error $device ${OUTPUT_DIR}/x16af95.$dsuffix @@ -90,6 +99,9 @@ # Do the standard non-interactive examples. # skip 14 and 17 because they are interactive. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 28 29 30; do + if [ "$verbose_test" ]; then + echo "x${index}f" + fi $f95dir/x${index}f <<EOF 2> test.error $device ${OUTPUT_DIR}/x${index}f95.$dsuffix Modified: trunk/plplot_test/test_java.sh.in =================================================================== --- trunk/plplot_test/test_java.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_java.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -21,7 +21,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $javadir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. + # N.B. $PLPLOT_CLASSPATH must be defined properly so it includes a # reference to plplot.jar. If not we assume in installation location. # The path must point to the java command for this to work. @@ -43,6 +44,9 @@ fi for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 20 21 22 23 24 25 26 27 28 29 30; do + if [ "$verbose_test" ]; then + echo "x${index}j" + fi if test "@WIN32@" = "1"; then java -classpath ${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j.$dsuffix $options 2> test.error else Modified: trunk/plplot_test/test_ocaml.sh.in =================================================================== --- trunk/plplot_test/test_ocaml.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_ocaml.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -20,10 +20,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $ocamldir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # Do the standard non-interactive examples. for index in 01 02 03 04 05 06 07 08 11 19; do + if [ "$verbose_test" ]; then + echo "x${index}ocaml" + fi $ocamldir/x${index}ocaml -dev $device -o ${OUTPUT_DIR}/x${index}ocaml.$dsuffix \ $options 2> test.error # Look for any status codes (segfaults, plexit) from the examples themselves. Modified: trunk/plplot_test/test_perl.sh.in =================================================================== --- trunk/plplot_test/test_perl.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_perl.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $perldir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. # To build the c examples before running this script do the following: # pushd $cdir; make; popd @@ -38,6 +38,9 @@ fi for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26; do + if [ "$verbose_test" ]; then + echo "x${index}.pl" + fi $perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}pdl.$dsuffix $options 2> test.error status_code=$? cat test.error Modified: trunk/plplot_test/test_python.sh.in =================================================================== --- trunk/plplot_test/test_python.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_python.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -20,8 +20,9 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -# This is called from plplot-test.sh with $pythondir, $device, -# $dsuffix, and $options defined. +# This is called from plplot-test.sh with $pythondir, $device, $dsuffix, +# $options, and possibly $verbose_test defined. + # $pythondir must be the build tree and not the source tree (if separate from # build tree) since must access plplot_python_start.py in build tree and # paths in that file are relative to build tree. @@ -32,6 +33,9 @@ # For 24 you need special fonts installed to get good result. for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 \ 20 22 23 24 25 26 27 28 29 30 @NUMPY_EXAMPLES@ ; do + if [ "$verbose_test" ]; then + echo "x${index}" + fi @PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p.$dsuffix $options 2> test.error status_code=$? cat test.error @@ -44,5 +48,4 @@ if test -n "$is_error"; then exit 1 fi - done Modified: trunk/plplot_test/test_tcl.sh.in =================================================================== --- trunk/plplot_test/test_tcl.sh.in 2008-08-13 23:04:34 UTC (rev 8643) +++ trunk/plplot_test/test_tcl.sh.in 2008-08-13 23:07:26 UTC (rev 8644) @@ -22,11 +22,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # This is called from plplot-test.sh with $tcldir, $device, $dsuffix, -# and $options defined. +# $options, and possibly $verbose_test defined. + cd $OUTPUT_DIR results=`pwd` export results cd $tcldir +if [ "$verbose_test" ]; then + echo "pltcl demo of plot" +fi pltcl -dev $device -o $results/plot.$dsuffix $options <<EOF 2> test.error plinit source plot.tcl @@ -47,6 +51,9 @@ if test -n "$is_error"; then exit 1 fi +if [ "$verbose_test" ]; then + echo "pltcl demo of plgrid" +fi pltcl -dev $device -o $results/plgrid.$dsuffix $options <<EOF 2> test.error plinit source plgrid.tcl @@ -69,6 +76,9 @@ # 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 15 16 18 22; do + if [ "$verbose_test" ]; then + echo "x${index}" + fi ./x${index} -dev $device -o $results/x${index}t.$dsuffix $options 2> test.error status_code=$? cat test.error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-10-17 23:17:45
|
Revision: 8918 http://plplot.svn.sourceforge.net/plplot/?rev=8918&view=rev Author: airwin Date: 2008-10-17 23:17:40 +0000 (Fri, 17 Oct 2008) Log Message: ----------- Use %n construct to insert page number into body of file name if familying makes it necessary. Modified Paths: -------------- 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/test_ada.sh.in =================================================================== --- trunk/plplot_test/test_ada.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_ada.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -39,7 +39,7 @@ if [ "$verbose_test" ]; then echo "x${index}a" fi - $adadir/x${index}a -dev $device -o ${OUTPUT_DIR}/x${index}a.$dsuffix $options 2> test.error + $adadir/x${index}a -dev $device -o ${OUTPUT_DIR}/x${index}a%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then Modified: trunk/plplot_test/test_c.sh.in =================================================================== --- trunk/plplot_test/test_c.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_c.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -34,7 +34,7 @@ if [ "$verbose_test" ]; then echo "x${index}c" fi - $cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c.$dsuffix \ + $cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c%n.$dsuffix \ $options 2> test.error # 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 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_cxx.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -29,7 +29,7 @@ # x01cc is a C++ alternative that has no corresponding examples for the # other front ends. -$cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc.$dsuffix $options +$cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options # Do the standard non-interactive examples. # skip 14 because it requires two output files. @@ -38,7 +38,7 @@ if [ "$verbose_test" ]; then echo "x${index}" fi - $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx.$dsuffix $options 2> test.error + $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_f77.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -37,7 +37,7 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af.$dsuffix $options 2> test.error + $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 @@ -56,7 +56,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f.$dsuffix $options 2> test.error + $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -81,7 +81,7 @@ fi $f77dir/x16af <<EOF 2> test.error $device -${OUTPUT_DIR}/x16af.$dsuffix +${OUTPUT_DIR}/x16af%n.$dsuffix EOF status_code=$? cat test.error @@ -103,7 +103,7 @@ fi $f77dir/x${index}f <<EOF 2> test.error $device -${OUTPUT_DIR}/x${index}f.$dsuffix +${OUTPUT_DIR}/x${index}f%n.$dsuffix EOF status_code=$? cat test.error Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_f95.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -37,7 +37,7 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95.$dsuffix $options 2> test.error + $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -57,7 +57,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95.$dsuffix $options 2> test.error + $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -81,7 +81,7 @@ fi $f95dir/x16af <<EOF 2> test.error $device -${OUTPUT_DIR}/x16af95.$dsuffix +${OUTPUT_DIR}/x16af95%n.$dsuffix EOF status_code=$? cat test.error @@ -104,7 +104,7 @@ fi $f95dir/x${index}f <<EOF 2> test.error $device -${OUTPUT_DIR}/x${index}f95.$dsuffix +${OUTPUT_DIR}/x${index}f95%n.$dsuffix EOF status_code=$? cat test.error Modified: trunk/plplot_test/test_java.sh.in =================================================================== --- trunk/plplot_test/test_java.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_java.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -48,9 +48,9 @@ echo "x${index}j" fi if test "@WIN32@" = "1"; then - java -classpath ${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j.$dsuffix $options 2> test.error + java -classpath ${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j%n.$dsuffix $options 2> test.error else - java -classpath ${javadir}:${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j.$dsuffix $options 2> test.error + java -classpath ${javadir}:${PLPLOT_CLASSPATH} ${JAVA_TEST_OPTS} plplot.examples.x${index} -dev $device -o ${OUTPUT_DIR}/x${index}j%n.$dsuffix $options 2> test.error fi status_code=$? cat test.error Modified: trunk/plplot_test/test_ocaml.sh.in =================================================================== --- trunk/plplot_test/test_ocaml.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_ocaml.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -27,7 +27,7 @@ if [ "$verbose_test" ]; then echo "x${index}ocaml" fi - $ocamldir/x${index}ocaml -dev $device -o ${OUTPUT_DIR}/x${index}ocaml.$dsuffix \ + $ocamldir/x${index}ocaml -dev $device -o ${OUTPUT_DIR}/x${index}ocaml%n.$dsuffix \ $options 2> test.error # Look for any status codes (segfaults, plexit) from the examples themselves. status_code=$? Modified: trunk/plplot_test/test_octave.sh.in =================================================================== --- trunk/plplot_test/test_octave.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_octave.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -63,7 +63,7 @@ if (verbose_test) printf("p%d\n",i); endif - figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); + figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d%%n.$dsuffix",i)); feval(sprintf("p%d",i)) closefig endfor @@ -88,7 +88,7 @@ plSetOpt("dev", device); #o trailer on filename e.g., x01o.ps) to distinguish from other #common examples. - file = sprintf("${OUTPUT_DIR}/x%.2do.$dsuffix",i); + file = sprintf("${OUTPUT_DIR}/x%.2do%%n.$dsuffix",i); plSetOpt("o", file); eval(cmd, "failed = [failed, i];"); endfor Modified: trunk/plplot_test/test_perl.sh.in =================================================================== --- trunk/plplot_test/test_perl.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_perl.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -41,7 +41,7 @@ if [ "$verbose_test" ]; then echo "x${index}.pl" fi - $perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}pdl.$dsuffix $options 2> test.error + $perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}pdl%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then Modified: trunk/plplot_test/test_python.sh.in =================================================================== --- trunk/plplot_test/test_python.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_python.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -36,7 +36,7 @@ if [ "$verbose_test" ]; then echo "x${index}" fi - @PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p.$dsuffix $options 2> test.error + @PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}p%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then Modified: trunk/plplot_test/test_tcl.sh.in =================================================================== --- trunk/plplot_test/test_tcl.sh.in 2008-10-17 22:44:26 UTC (rev 8917) +++ trunk/plplot_test/test_tcl.sh.in 2008-10-17 23:17:40 UTC (rev 8918) @@ -31,7 +31,7 @@ if [ "$verbose_test" ]; then echo "pltcl demo of plot" fi -pltcl -dev $device -o $results/plot.$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.$dsuffix $options <<EOF 2> test.error +pltcl -dev $device -o $results/plgrid%n.$dsuffix $options <<EOF 2> test.error plinit source plgrid.tcl plgrid @@ -79,7 +79,7 @@ if [ "$verbose_test" ]; then echo "x${index}" fi - ./x${index} -dev $device -o $results/x${index}t.$dsuffix $options 2> test.error + ./x${index} -dev $device -o $results/x${index}t%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-10-29 15:32:47
|
Revision: 8982 http://plplot.svn.sourceforge.net/plplot/?rev=8982&view=rev Author: andrewross Date: 2008-10-29 15:32:38 +0000 (Wed, 29 Oct 2008) Log Message: ----------- Initial support for valgrind (or other debugger / memory checker) in plplot-test.sh. Currently only enabled for the c tests. Adding the --debug option to plplot-test.sh will run each example through valgrind and generate a separate log file containing the output. Alternative debugging commands can be specified using the --debug=* version of the option. Modified Paths: -------------- trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_c.sh.in Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2008-10-29 15:13:39 UTC (rev 8981) +++ trunk/plplot_test/plplot-test.sh.cmake 2008-10-29 15:32:38 UTC (rev 8982) @@ -37,8 +37,9 @@ EXAMPLES_DIR=${EXAMPLES_DIR:-.} SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} OUTPUT_DIR=${OUTPUT_DIR:-.} +DEBUG_CMD=${DEBUG_CMD:-.} device=${DEVICE:-psc} -export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device +export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD usage() { @@ -59,6 +60,9 @@ Specify location where the resulting files are stored. Defaults to "." [--verbose] Echo each PLplot example that is executed. + [--debug="debug command"] + Run examples with given debug command. + [--debug] Run examples with default debug command (valgrind). [--version] [--help] @@ -123,6 +127,12 @@ --output-dir=*) OUTPUT_DIR=$optarg ;; + --debug=*) + DEBUG_CMD=$optarg + ;; + --debug) + DEBUG_CMD="valgrind --leak-check=full --show-reachable=yes --log-file=valgrind.x%q{index}%q{lang}.%q{dsuffix}.log" + ;; --help) usage 0 1>&2 ;; Modified: trunk/plplot_test/test_c.sh.in =================================================================== --- trunk/plplot_test/test_c.sh.in 2008-10-29 15:13:39 UTC (rev 8981) +++ trunk/plplot_test/test_c.sh.in 2008-10-29 15:32:38 UTC (rev 8982) @@ -29,12 +29,14 @@ # Do the standard non-interactive examples. # skip 14 because it requires two output files. # skip 17 because it is interactive. +lang="c" for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \ 21 22 23 24 25 26 27 28 29 30; do if [ "$verbose_test" ]; then - echo "x${index}c" + echo "x${index}${lang}" fi - $cdir/x${index}c -dev $device -o ${OUTPUT_DIR}/x${index}c%n.$dsuffix \ + export index lang dsuffix + $DEBUG_CMD $cdir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \ $options 2> test.error # Look for any status codes (segfaults, plexit) from the examples themselves. status_code=$? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2011-08-12 09:10:37
|
Revision: 11874 http://plplot.svn.sourceforge.net/plplot/?rev=11874&view=rev Author: andrewross Date: 2011-08-12 09:10:30 +0000 (Fri, 12 Aug 2011) Log Message: ----------- Make sure test_d.sh is executable in build tree. Remove chmod commands from plplot-test.sh as cmake now deals with this. Modified Paths: -------------- trunk/plplot_test/plplot-test.sh.cmake Property Changed: ---------------- trunk/plplot_test/test_d.sh.in Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2011-08-12 08:48:08 UTC (rev 11873) +++ trunk/plplot_test/plplot-test.sh.cmake 2011-08-12 09:10:30 UTC (rev 11874) @@ -233,9 +233,6 @@ echo "Testing interactive octave examples for device $device" script="$scripts_dir"/test_octave_interactive.sh fi - if [ "@WIN32@" != "1" ] ; then - chmod +x "$script" - fi @SH_EXECUTABLE@ "$script" || status=1 exit $status @@ -405,9 +402,6 @@ for i in $FRONT_END ; do echo "Testing front-end $i" script="$scripts_dir"/test_$i.sh - if [ "@WIN32@" != "1" ] ; then - chmod +x "$script" - fi @SH_EXECUTABLE@ "$script" || status=1 done Property changes on: trunk/plplot_test/test_d.sh.in ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2008-10-29 22:02:04
|
Revision: 8983 http://plplot.svn.sourceforge.net/plplot/?rev=8983&view=rev Author: andrewross Date: 2008-10-29 22:02:01 +0000 (Wed, 29 Oct 2008) Log Message: ----------- Tidy up valgrind support for plplot tests. Add support to c++, f77 and f95 scripts. Modified Paths: -------------- 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 Modified: trunk/plplot_test/test_c.sh.in =================================================================== --- trunk/plplot_test/test_c.sh.in 2008-10-29 15:32:38 UTC (rev 8982) +++ trunk/plplot_test/test_c.sh.in 2008-10-29 22:02:01 UTC (rev 8983) @@ -30,12 +30,12 @@ # skip 14 because it requires two output files. # skip 17 because it is interactive. lang="c" +export index lang for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \ 21 22 23 24 25 26 27 28 29 30; do if [ "$verbose_test" ]; then echo "x${index}${lang}" fi - export index lang dsuffix $DEBUG_CMD $cdir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \ $options 2> test.error # Look for any status codes (segfaults, plexit) from the examples themselves. Modified: trunk/plplot_test/test_cxx.sh.in =================================================================== --- trunk/plplot_test/test_cxx.sh.in 2008-10-29 15:32:38 UTC (rev 8982) +++ trunk/plplot_test/test_cxx.sh.in 2008-10-29 22:02:01 UTC (rev 8983) @@ -27,9 +27,13 @@ # To build the c++ examples before running this script do the following: # pushd $cxxdir; make; popd +lang="cxx" +export index lang + # x01cc is a C++ alternative that has no corresponding examples for the # other front ends. -$cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options +index=01c +$DEBUG_CMD $cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options # Do the standard non-interactive examples. # skip 14 because it requires two output files. @@ -38,7 +42,7 @@ if [ "$verbose_test" ]; then echo "x${index}" fi - $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error + $DEBUG_CMD $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2008-10-29 15:32:38 UTC (rev 8982) +++ trunk/plplot_test/test_f77.sh.in 2008-10-29 22:02:01 UTC (rev 8983) @@ -26,6 +26,8 @@ # To build the f77 examples before running this script do the following: # pushd $f77dir; make; popd +lang="f" +export index lang if test "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 @@ -37,7 +39,8 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f77dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af%n.$dsuffix $options 2> test.error + 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 @@ -56,7 +59,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f%n.$dsuffix $options 2> test.error + $DEBUG_CMD $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -79,7 +82,7 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f77dir/x16af <<EOF 2> test.error + $DEBUG_CMD $f77dir/x16af <<EOF 2> test.error $device ${OUTPUT_DIR}/x16af%n.$dsuffix EOF @@ -101,7 +104,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f77dir/x${index}f <<EOF 2> test.error + $DEBUG_CMD $f77dir/x${index}f <<EOF 2> test.error $device ${OUTPUT_DIR}/x${index}f%n.$dsuffix EOF Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2008-10-29 15:32:38 UTC (rev 8982) +++ trunk/plplot_test/test_f95.sh.in 2008-10-29 22:02:01 UTC (rev 8983) @@ -26,6 +26,9 @@ # To build the f95 examples before running this script do the following: # pushd $f95dir; make; popd +lang="f95" +export index lang + if test "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 @@ -37,7 +40,7 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95%n.$dsuffix $options 2> test.error + $DEBUG_CMD $f95dir/x16af -dev $device -o ${OUTPUT_DIR}/x16af95%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -57,7 +60,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $options 2> test.error + $DEBUG_CMD $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $options 2> test.error status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then @@ -79,7 +82,7 @@ if [ "$verbose_test" ]; then echo "x16af" fi - $f95dir/x16af <<EOF 2> test.error + $DEBUG_CMD $f95dir/x16af <<EOF 2> test.error $device ${OUTPUT_DIR}/x16af95%n.$dsuffix EOF @@ -102,7 +105,7 @@ if [ "$verbose_test" ]; then echo "x${index}f" fi - $f95dir/x${index}f <<EOF 2> test.error + $DEBUG_CMD $f95dir/x${index}f <<EOF 2> test.error $device ${OUTPUT_DIR}/x${index}f95%n.$dsuffix EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2009-01-06 10:35:26
|
Revision: 9261 http://plplot.svn.sourceforge.net/plplot/?rev=9261&view=rev Author: andrewross Date: 2009-01-06 10:35:23 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Remove bash-isms from shell scripts so string comparison is done with = and not ==. This is posix compliant and will work with sh as well as bash. Modified Paths: -------------- trunk/plplot_test/test_java.sh.in trunk/plplot_test/test_perl.sh.in Modified: trunk/plplot_test/test_java.sh.in =================================================================== --- trunk/plplot_test/test_java.sh.in 2009-01-06 08:24:22 UTC (rev 9260) +++ trunk/plplot_test/test_java.sh.in 2009-01-06 10:35:23 UTC (rev 9261) @@ -48,7 +48,7 @@ if [ "$verbose_test" ]; then echo "x${index}" fi - if test "@WIN32@" == "1"; then + if test "@WIN32@" = "1"; then 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 else java -classpath ${javadir}:${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 Modified: trunk/plplot_test/test_perl.sh.in =================================================================== --- trunk/plplot_test/test_perl.sh.in 2009-01-06 08:24:22 UTC (rev 9260) +++ trunk/plplot_test/test_perl.sh.in 2009-01-06 10:35:23 UTC (rev 9261) @@ -32,13 +32,13 @@ # Ensure correct version of the libraries are picked up in both the build # tree and install tree. lang="pdl" -if [ "$LD_LIBRARY_PATH" == "" ] ; then +if [ "$LD_LIBRARY_PATH" = "" ] ; then export LD_LIBRARY_PATH=../src:@LIB_DIR@ else export LD_LIBRARY_PATH=../src:@LIB_DIR@:$LD_LIBRARY_PATH fi -if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" == "ON" ] ; then +if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" = "ON" ] ; then INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30 31" else # Examples 02, 20, 21, 23, 24, 28, 29, and 30 require PDL::Graphics::PLplot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-06 18:05:52
|
Revision: 9263 http://plplot.svn.sourceforge.net/plplot/?rev=9263&view=rev Author: airwin Date: 2009-01-06 18:05:51 +0000 (Tue, 06 Jan 2009) Log Message: ----------- Clean up indentation issues. Modified Paths: -------------- 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_diff.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/test_ada.sh.in =================================================================== --- trunk/plplot_test/test_ada.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_ada.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -30,32 +30,32 @@ # Skip 17 because it is interactive. lang="a" 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 \ -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 - echo "x${index}" - fi - if [ "$index" = "14" -o "$index" = "thick14" ] ; then - $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 << EOF + 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 \ + 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 + echo "x${index}" + fi + if [ "$index" = "14" -o "$index" = "thick14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF - 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_c.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -31,31 +31,31 @@ lang="c" 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 - echo "x${index}${lang}" - fi - if [ "$index" = "14" ] ; then - $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 << EOF + 21 22 23 24 25 26 27 28 29 30 31; do + if [ "$verbose_test" ]; then + echo "x${index}${lang}" + fi + if [ "$index" = "14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF # 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 + 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 # Look for any status codes (segfaults, plexit) from the examples themselves. - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + fi + 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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_cxx.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -38,26 +38,26 @@ # 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 - echo "x${index}" - fi - if [ "$index" = "14" ] ; then - $DEBUG_CMD $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt << EOF + if [ "$verbose_test" ]; then + echo "x${index}" + fi + if [ "$index" = "14" ] ; then + $DEBUG_CMD $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt << EOF ${OUTPUT_DIR}/x${index}acxx%n.$dsuffix EOF - status_code=$? - else - $DEBUG_CMD $cxxdir/x${index} -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 - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + else + $DEBUG_CMD $cxxdir/x${index} -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 + 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 test -n "$is_error"; then + exit 1 + fi done Modified: trunk/plplot_test/test_diff.sh.in =================================================================== --- trunk/plplot_test/test_diff.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_diff.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -27,101 +27,100 @@ for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml ; do # Check which suffix is used for this binding - case $lang in - c++) - xsuffix= - suffix=cxx - ;; - f77) - xsuffix= - suffix=f - ;; - f95) - xsuffix= - suffix=f95 - ;; - java) - xsuffix= - suffix=j - ;; - octave) - xsuffix= - suffix=o - ;; - python) - xsuffix= - suffix=p - ;; - tcl) - xsuffix= - suffix=t - ;; - perl) - xsuffix= - suffix=pdl - ;; - ada) - xsuffix= - suffix=a - ;; - adathick) - xsuffix= - suffix=a - ;; - ocaml) - xsuffix= - suffix=ocaml - ;; - esac + case $lang in + c++) + xsuffix= + suffix=cxx + ;; + f77) + xsuffix= + suffix=f + ;; + f95) + xsuffix= + suffix=f95 + ;; + java) + xsuffix= + suffix=j + ;; + octave) + xsuffix= + suffix=o + ;; + python) + xsuffix= + suffix=p + ;; + tcl) + xsuffix= + suffix=t + ;; + perl) + xsuffix= + suffix=pdl + ;; + ada) + xsuffix= + suffix=a + ;; + adathick) + xsuffix= + suffix=a + ;; + ocaml) + xsuffix= + suffix=ocaml + ;; + esac - missing="" - different="" - diffstdout="" - missingstdout="" + missing="" + different="" + diffstdout="" + missingstdout="" # Assume that if example 1 is missing then the language is # not implemented. - if [ -f x${xsuffix}01${suffix}.psc ] ; then - + if [ -f x${xsuffix}01${suffix}.psc ] ; then + # Standard non-interactive examples # Skip example 17 because it is interactive - for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 18 19 20 \ - 21 22 23 24 25 26 27 28 29 30 31 ; do - if [ ! -f x${xsuffix}${index}c.psc ] ; then - echo "C example ${index} is missing" - else - if [ ! -f x${xsuffix}${index}${suffix}.psc ] ; then - missing="${missing} ${index}" - else - @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}c.psc > test1.psc - @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}${suffix}.psc > test2.psc - @DIFF_EXECUTABLE@ -q test1.psc test2.psc 2>&1 > /dev/null - if [ $? != 0 ] ; then - different="${different} ${index}" - fi - if [ "$index" != "14a" ] ; then - if [ -f x${xsuffix}${index}${suffix}_psc.txt ] ; then - @DIFF_EXECUTABLE@ -q x${xsuffix}${index}c_psc.txt x${xsuffix}${index}${suffix}_psc.txt 2>&1 > /dev/null - if [ $? != 0 ] ; then - diffstdout="${diffstdout} ${index}" - fi - else - missingstdout="${missingstdout} ${index}" - fi - fi - fi - fi - done - echo "${lang}" - echo " Missing examples : ${missing}" - echo " Differing postscript output : ${different}" - echo " Missing stdout : ${missingstdout}" - echo " Differing stdout : ${diffstdout}" - if [ "${different}" != "" -o "${diffstdout}" != "" ] ; then - ret=1 - fi - fi + for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 18 19 20 \ + 21 22 23 24 25 26 27 28 29 30 31 ; do + if [ ! -f x${xsuffix}${index}c.psc ] ; then + echo "C example ${index} is missing" + else + if [ ! -f x${xsuffix}${index}${suffix}.psc ] ; then + missing="${missing} ${index}" + else + @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}c.psc > test1.psc + @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}${suffix}.psc > test2.psc + @DIFF_EXECUTABLE@ -q test1.psc test2.psc 2>&1 > /dev/null + if [ $? != 0 ] ; then + different="${different} ${index}" + fi + if [ "$index" != "14a" ] ; then + if [ -f x${xsuffix}${index}${suffix}_psc.txt ] ; then + @DIFF_EXECUTABLE@ -q x${xsuffix}${index}c_psc.txt x${xsuffix}${index}${suffix}_psc.txt 2>&1 > /dev/null + if [ $? != 0 ] ; then + diffstdout="${diffstdout} ${index}" + fi + else + missingstdout="${missingstdout} ${index}" + fi + fi + fi + fi + done + echo "${lang}" + echo " Missing examples : ${missing}" + echo " Differing postscript output : ${different}" + echo " Missing stdout : ${missingstdout}" + echo " Differing stdout : ${diffstdout}" + if [ "${different}" != "" -o "${diffstdout}" != "" ] ; then + ret=1 + fi + fi done exit ${ret} - Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_f77.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -36,106 +36,106 @@ # Do non-standard example 16a because it illustrates plshade functionality # with cmap1 (and also because the result looks nice.) - 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 - exit $status_code - fi + 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 + 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 test -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 - echo "x${index}f" - fi - if [ "${index}" = "14" ] ; then - $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 << EOF + 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 + echo "x${index}f" + fi + if [ "${index}" = "14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}af%n.$dsuffix EOF 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 test -n "$is_error"; then + exit 1 + fi - done + done else # Fall back to this method if this fortran platform does not have # command-line parsing capability. Command-line $options must be ignored # 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 - echo "x16af" - fi - $DEBUG_CMD $f77dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt + if [ "$verbose_test" ]; then + echo "x16af" + fi + $DEBUG_CMD $f77dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt $device ${OUTPUT_DIR}/x16af%n.$dsuffix EOF status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then - exit $status_code + 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 + 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 - 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 + if [ "$verbose_test" ]; then + 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 $device ${OUTPUT_DIR}/x${index}f%n.$dsuffix $device ${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 + status_code=$? + else + $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 EOF - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + fi + 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 test -n "$is_error"; then + exit 1 + fi done fi Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_f95.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -37,105 +37,105 @@ # Do non-standard example 16a because it illustrates plshade functionality # with cmap1 (and also because the result looks nice.) - 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 - exit $status_code - fi + 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 + 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 test -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 - echo "x${index}f" - fi - if [ "${index}" = "14" ] ; then - $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 << EOF + 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 + echo "x${index}f" + fi + if [ "${index}" = "14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}af95%n.$dsuffix EOF 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 - done + is_error=`grep -l 'PLPLOT ERROR' test.error` + if test -n "$is_error"; then + exit 1 + fi + done else # Fall back to this method if this fortran platform does not have # command-line parsing capability. Command-line $options must be ignored # 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 - echo "x16af" - fi - $DEBUG_CMD $f95dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt + if [ "$verbose_test" ]; then + echo "x16af" + fi + $DEBUG_CMD $f95dir/x16af <<EOF 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt $device ${OUTPUT_DIR}/x16af95%n.$dsuffix EOF status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then - exit $status_code + 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 + 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 - 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 + if [ "$verbose_test" ]; then + 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 $device ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $device ${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 + status_code=$? + else + $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 EOF - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + fi + 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 test -n "$is_error"; then + exit 1 + fi done fi Modified: trunk/plplot_test/test_java.sh.in =================================================================== --- trunk/plplot_test/test_java.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_java.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -37,37 +37,37 @@ # Set up option to point to java bindings jar file and wrapper if needed. lang="j" if test -n "$PLPLOT_JAVA_WRAP_DIR" ; then - JAVA_TEST_OPTS="-Dplplot.libdir=$PLPLOT_JAVA_WRAP_DIR" + JAVA_TEST_OPTS="-Dplplot.libdir=$PLPLOT_JAVA_WRAP_DIR" fi if test -z "$PLPLOT_CLASSPATH" ; then - PLPLOT_CLASSPATH=@JAVADATA_HARDDIR@/plplot.jar + PLPLOT_CLASSPATH=@JAVADATA_HARDDIR@/plplot.jar fi if test "@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 18 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 - 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 << EOF + if [ "$verbose_test" ]; then + echo "x${index}" + fi + if [ "$index" = "14" ] ; then + 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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF - 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 test -n "$is_error"; then + exit 1 + fi done Modified: trunk/plplot_test/test_ocaml.sh.in =================================================================== --- trunk/plplot_test/test_ocaml.sh.in 2009-01-06 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_ocaml.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -25,30 +25,30 @@ # 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 - echo "x${index}ocaml" - fi - if [ "$index" = "14" ] ; then - $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 << EOF + if [ "$verbose_test" ]; then + echo "x${index}ocaml" + fi + if [ "$index" = "14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF # 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 + 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 # Look for any status codes (segfaults, plexit) from the examples themselves. - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + fi + 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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_octave.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -43,51 +43,51 @@ # Check verbose_test variable if (strcmp(getenv("verbose_test"),"on") == 1) - verbose_test = 1; +verbose_test = 1; else - verbose_test = 0; -endif + verbose_test = 0; + endif -plplot_stub; -t = split("$options", "-"); -if (t); t(1,:)=""; endif; -for i=1:rows(t) - tt = deblank (t(i,:)); len = length(tt); - ix = index(tt," "); - if (ix == 0); ix = len; len = 0; endif - plsetopt(tt(1:ix), tt(ix+1:len)); -endfor + plplot_stub; + t = split("$options", "-"); + if (t); t(1,:)=""; endif; + for i=1:rows(t) + tt = deblank (t(i,:)); len = length(tt); + ix = index(tt," "); + if (ix == 0); ix = len; len = 0; endif + plsetopt(tt(1:ix), tt(ix+1:len)); + endfor # p7 works OK with plmeta, e.g., but not ps or psc. pleop/plbop issue? # These require octave-2.1.50 so comment out since not everybody has # this. -for i=[1:7 8 9 13 15 16]; - if (verbose_test) - printf("p%d\n",i); - endif - figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d%%n.$dsuffix",i)); - feval(sprintf("p%d",i)) - closefig -endfor + for i=[1:7 8 9 13 15 16]; + if (verbose_test) + printf("p%d\n",i); + endif + figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d%%n.$dsuffix",i)); + feval(sprintf("p%d",i)) + closefig + endfor #plot equivalent of x??c examples. These only required octave-2.0.x #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 ]; - ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i); - strm = fopen(ofile,"w"); - cmd = sprintf("x%.2dc",i); - if (verbose_test) - printf("%s\n",cmd); - endif - t = split("$options", "-"); t(1,:)=""; - for j=1:rows(t) - tt = deblank (t(j,:)); len = length(tt); - ix = index(tt," "); - if (ix == 0); ix = len; len = 0; endif - plSetOpt(deblank(tt(1:ix)), tt(ix:len)); + 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); + if (verbose_test) + printf("%s\n",cmd); + endif + t = split("$options", "-"); t(1,:)=""; + for j=1:rows(t) + tt = deblank (t(j,:)); len = length(tt); + ix = index(tt," "); + if (ix == 0); ix = len; len = 0; endif + plSetOpt(deblank(tt(1:ix)), tt(ix:len)); endfor device="$device"; plSetOpt("dev", device); @@ -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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_perl.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -32,40 +32,40 @@ # 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 - INDEX_LIST="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" + INDEX_LIST="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" else # Examples 02, 20, 21, 23, 24, 28, 29, and 30 require PDL::Graphics::PLplot # version 0.46 or later. - INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 22 25 26 27" + INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 14 15 16 18 19 22 25 26 27" fi for index in $INDEX_LIST ; do - if [ "$verbose_test" ]; then - echo "x${index}.pl" - fi - if [ "$index" = "14" ] ; then - $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 << EOF + if [ "$verbose_test" ]; then + echo "x${index}.pl" + fi + if [ "$index" = "14" ] ; then + $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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF - 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_python.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -32,27 +32,27 @@ # For 24 you need special fonts installed to get good result. 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 - echo "x${index}" - fi - if [ "$index" = "14" ] ; then - @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 << EOF + 20 22 23 24 25 26 27 28 29 30 31 @NUMPY_EXAMPLES@ ; do + if [ "$verbose_test" ]; then + echo "x${index}" + fi + if [ "$index" = "14" ] ; then + @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 << EOF ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix EOF - 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 - status_code=$? - fi - cat test.error - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + 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 + status_code=$? + fi + 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 test -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 15:18:53 UTC (rev 9262) +++ trunk/plplot_test/test_tcl.sh.in 2009-01-06 18:05:51 UTC (rev 9263) @@ -29,7 +29,7 @@ export results cd $tcldir if [ "$verbose_test" ]; then - echo "pltcl demo of plot" + echo "pltcl demo of plot" fi pltcl -dev $device -o $results/plot%n.$dsuffix $options <<EOF 2> test.error plinit @@ -43,16 +43,16 @@ status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then - exit $status_code + 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 + exit 1 fi if [ "$verbose_test" ]; then - echo "pltcl demo of plgrid" + echo "pltcl demo of plgrid" fi pltcl -dev $device -o $results/plgrid%n.$dsuffix $options <<EOF 2> test.error plinit @@ -63,38 +63,38 @@ status_code=$? cat test.error if [ "$status_code" -ne 0 ]; then - exit $status_code + 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 + 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 - echo "x${index}" - fi - if [ "$index" = "14" ] ; then - ./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt << EOF + if [ "$verbose_test" ]; then + echo "x${index}" + fi + if [ "$index" = "14" ] ; then + ./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt << EOF ${results}/x${index}a${lang}%n.$dsuffix EOF - status_code=$? - else - ./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 - if [ "$status_code" -ne 0 ]; then - exit $status_code - fi + status_code=$? + else + ./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 + 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 test -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. |
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. |
From: <and...@us...> - 2009-01-07 09:23:36
|
Revision: 9270 http://plplot.svn.sourceforge.net/plplot/?rev=9270&view=rev Author: andrewross Date: 2009-01-07 09:23:31 +0000 (Wed, 07 Jan 2009) Log Message: ----------- Add missing spaces between [ and following expression in test scripts. Modified Paths: -------------- trunk/plplot_test/test_f77.sh.in trunk/plplot_test/test_octave.sh.in Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2009-01-07 05:19:13 UTC (rev 9269) +++ trunk/plplot_test/test_f77.sh.in 2009-01-07 09:23:31 UTC (rev 9270) @@ -49,7 +49,7 @@ # 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 [-n "$is_error" ] ; then + if [ -n "$is_error" ] ; then exit 1 fi Modified: trunk/plplot_test/test_octave.sh.in =================================================================== --- trunk/plplot_test/test_octave.sh.in 2009-01-07 05:19:13 UTC (rev 9269) +++ trunk/plplot_test/test_octave.sh.in 2009-01-07 09:23:31 UTC (rev 9270) @@ -122,6 +122,6 @@ # 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 [-n "$is_error" ] ; then +if [ -n "$is_error" ] ; then exit 1 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-01-24 13:38:30
|
Revision: 9381 http://plplot.svn.sourceforge.net/plplot/?rev=9381&view=rev Author: smekal Date: 2009-01-24 13:38:21 +0000 (Sat, 24 Jan 2009) Log Message: ----------- For example 14 the filename for the second stream is echoed instead of piped in, so that win-bash runs the scripts correctly. Apart from the C script actually no other script was tested if the changes work. For the C and C++ script example 14, 17 and 29 were deleted from the for loop. A variable critical_examples was introduced which for the moment is set to "14 17" for the Windows case and "14 17 29" for the non Windows case. 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_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-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/plplot-test.sh.cmake 2009-01-24 13:38:21 UTC (rev 9381) @@ -309,6 +309,12 @@ for i in $FRONT_END ; do echo "Testing front-end $i" script=$scripts_dir/test_$i.sh + if [ "@WIN32@" = "1" ] ; then + critical_examples="14 17" + else + critical_examples="14 17 29" + fi + export critical_examples if [ "@WIN32@" != "1" ] ; then chmod +x $script fi Modified: trunk/plplot_test/test_ada.sh.in =================================================================== --- trunk/plplot_test/test_ada.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_ada.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -40,9 +40,9 @@ echo "x${index}" fi if [ "$index" = "14" -o "$index" = "thick14" ] ; then - $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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_c.sh.in =================================================================== --- trunk/plplot_test/test_c.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_c.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -29,16 +29,15 @@ # Do the standard non-interactive examples. lang="c" export index lang -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 +for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \ + 21 22 23 24 25 26 27 28 30 31 ${critical_examples}; do if [ "$verbose_test" ] ; then 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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF + $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 Modified: trunk/plplot_test/test_cxx.sh.in =================================================================== --- trunk/plplot_test/test_cxx.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_cxx.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -36,14 +36,15 @@ $DEBUG_CMD $cxxdir/x01cc -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 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31; do +for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \ + 21 22 23 24 25 26 27 28 30 31 ${critical_examples}; do if [ "$verbose_test" ] ; then echo "x${index}" fi if [ "$index" = "14" ] ; then - $DEBUG_CMD $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt << EOF -${OUTPUT_DIR}/x${index}acxx%n.$dsuffix -EOF + echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \ + $DEBUG_CMD "$cxxdir/x${index}" -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} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_f77.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -59,9 +59,9 @@ echo "x${index}f" fi if [ "${index}" = "14" ] ; then - $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 << EOF -${OUTPUT_DIR}/x${index}af%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_f95.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -60,9 +60,9 @@ echo "x${index}f" fi if [ "${index}" = "14" ] ; then - $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 << EOF -${OUTPUT_DIR}/x${index}af95%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_java.sh.in =================================================================== --- trunk/plplot_test/test_java.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_java.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -49,9 +49,9 @@ echo "x${index}" fi if [ "$index" = "14" ] ; then - 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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_ocaml.sh.in =================================================================== --- trunk/plplot_test/test_ocaml.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_ocaml.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -29,11 +29,10 @@ echo "x${index}ocaml" fi if [ "$index" = "14" ] ; then - $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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF - # Look for any status codes (segfaults, plexit) from the examples themselves. + 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 \ Modified: trunk/plplot_test/test_perl.sh.in =================================================================== --- trunk/plplot_test/test_perl.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_perl.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -49,9 +49,9 @@ echo "x${index}.pl" fi if [ "$index" = "14" ] ; then - $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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_python.sh.in =================================================================== --- trunk/plplot_test/test_python.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_python.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -35,9 +35,9 @@ echo "x${index}" fi if [ "$index" = "14" ] ; then - @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 << EOF -${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix -EOF + 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 Modified: trunk/plplot_test/test_tcl.sh.in =================================================================== --- trunk/plplot_test/test_tcl.sh.in 2009-01-23 23:04:38 UTC (rev 9380) +++ trunk/plplot_test/test_tcl.sh.in 2009-01-24 13:38:21 UTC (rev 9381) @@ -76,9 +76,9 @@ echo "x${index}" fi if [ "$index" = "14" ] ; then - ./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix $options 2> test.error >| ${results}/x${index}${lang}_${dsuffix}.txt << EOF -${results}/x${index}a${lang}%n.$dsuffix -EOF + 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-01-30 00:34:38
|
Revision: 9415 http://plplot.svn.sourceforge.net/plplot/?rev=9415&view=rev Author: airwin Date: 2009-01-30 00:34:33 +0000 (Fri, 30 Jan 2009) Log Message: ----------- Implement ctest for Lua. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_diff.sh.in Added Paths: ----------- trunk/plplot_test/test_lua.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2009-01-29 22:48:54 UTC (rev 9414) +++ trunk/plplot_test/CMakeLists.txt 2009-01-30 00:34:33 UTC (rev 9415) @@ -160,6 +160,18 @@ ) endif(ENABLE_ocaml) + if(ENABLE_lua) + configure_file( + test_lua.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_lua.sh + @ONLY + ) + list(APPEND SCRIPTS test_lua.sh) + add_test(examples_lua + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=lua" + ) + endif(ENABLE_lua) + # Run C examples with different drivers if(PLD_psc) if (NOT TEST_DEVICE STREQUAL "psc") Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2009-01-29 22:48:54 UTC (rev 9414) +++ trunk/plplot_test/plplot-test.sh.cmake 2009-01-30 00:34:33 UTC (rev 9415) @@ -47,7 +47,7 @@ Options: [--device=DEVICE] (DEVICE = any cmake-enabled device. psc is the default) - [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, perl, ada, or ocaml) + [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, perl, ada, ocaml, or lua) If this option is not specified, then all front-ends will be tested. More than one front-end may be given, like this --front-end="c cxx" @@ -114,6 +114,7 @@ -o $i = "perl" \ -o $i = "ada" \ -o $i = "ocaml" \ + -o $i = "lua" \ ] \ || usage 0 1>&2 done @@ -167,6 +168,7 @@ javadir=$EXAMPLES_DIR/java adadir=$EXAMPLES_DIR/ada ocamldir=$EXAMPLES_DIR/ocaml +luadir=$EXAMPLES_DIR/lua octave=@OCTAVE@ octavedir=\ $EXAMPLES_DIR/../bindings/octave:\ @@ -180,7 +182,7 @@ @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 PATH +export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir PATH fe="" @@ -292,6 +294,7 @@ 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_lua@" = "ON" && FRONT_END="$FRONT_END lua" fi # Find where the front-end scripts are by looking at the directory name of the Modified: trunk/plplot_test/test_diff.sh.in =================================================================== --- trunk/plplot_test/test_diff.sh.in 2009-01-29 22:48:54 UTC (rev 9414) +++ trunk/plplot_test/test_diff.sh.in 2009-01-30 00:34:33 UTC (rev 9415) @@ -25,8 +25,8 @@ xsuffix_c= # Compare C results with c++, f77, f95, java, octave, python, tcl, perl, -# ada and ocaml results -for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml ; do +# ada, ocaml, and lua results +for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml lua; do # Check which suffix is used for this binding case $lang in @@ -74,6 +74,10 @@ xsuffix= suffix=ocaml ;; + lua) + xsuffix= + suffix=lua + ;; esac missing="" Added: trunk/plplot_test/test_lua.sh.in =================================================================== --- trunk/plplot_test/test_lua.sh.in (rev 0) +++ trunk/plplot_test/test_lua.sh.in 2009-01-30 00:34:33 UTC (rev 9415) @@ -0,0 +1,61 @@ +#!@SH_EXECUTABLE@ +# Test suite for lua examples. +# +# Copyright (C) 2008 Andrew Ross +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# This is called from plplot-test.sh with $luadir, $device, $dsuffix, +# $options, and possibly $verbose_test defined. + +# Do the standard non-interactive examples. +lang="lua" +# Lua examples must be run from the directory where they exist. +cd $OUTPUT_DIR +results=`pwd` +export results +echo $results +cd $luadir +# 01, 08, 09, 15, 16, 19, 22, 25, 30 are implemented but do not currently work. +# 14, 17, 20, 21, 23, 26, 27, 28, 29, 31 are not implemented. +for index in 02 03 04 05 06 07 10 11 12 13 18 24; do + if [ "$verbose_test" ] ; then + echo "x${index}" + fi + if [ "$index" = "14" ] ; then + echo ${results}/x${index}a${lang}%n.$dsuffix | \ + lua 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 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 + 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 [ -n "$is_error" ] ; then + exit 1 + fi +done Property changes on: trunk/plplot_test/test_lua.sh.in ___________________________________________________________________ Added: svn:executable + * Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-02-10 08:49:56
|
Revision: 9496 http://plplot.svn.sourceforge.net/plplot/?rev=9496&view=rev Author: smekal Date: 2009-02-10 08:49:52 +0000 (Tue, 10 Feb 2009) Log Message: ----------- Added example 29 to critical examples again for Win32 so that this C example is run. If this works for a while we can remove the critical_examples workaround. Added lua example 29 to lua test script. Modified Paths: -------------- trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_lua.sh.in Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2009-02-10 08:47:40 UTC (rev 9495) +++ trunk/plplot_test/plplot-test.sh.cmake 2009-02-10 08:49:52 UTC (rev 9496) @@ -313,7 +313,7 @@ echo "Testing front-end $i" script=$scripts_dir/test_$i.sh if [ "@WIN32@" = "1" ] ; then - critical_examples="14 17" + critical_examples="14 17 29" else critical_examples="14 17 29" fi Modified: trunk/plplot_test/test_lua.sh.in =================================================================== --- trunk/plplot_test/test_lua.sh.in 2009-02-10 08:47:40 UTC (rev 9495) +++ trunk/plplot_test/test_lua.sh.in 2009-02-10 08:49:52 UTC (rev 9496) @@ -30,9 +30,9 @@ export results echo $results cd $luadir -# 09, 15, 16, 17, 19, 22, 25, 30, 31 are implemented but do not currently work. -# 14, 20, 21, 23, 26, 27, 28, 29, are not implemented. -for index in 01 02 03 04 05 06 07 08 10 11 12 13 17 18 24 31; do +# 09, 15, 16, 17, 19, 22, 25, 29, 30, 31 are implemented but do not currently work. +# 14, 20, 21, 23, 26, 27, 28 are not implemented. +for index in 01 02 03 04 05 06 07 08 10 11 12 13 17 18 24 29 31; do if [ "$verbose_test" ] ; then echo "x${index}" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-02-17 20:34:39
|
Revision: 9536 http://plplot.svn.sourceforge.net/plplot/?rev=9536&view=rev Author: smekal Date: 2009-02-17 20:34:34 +0000 (Tue, 17 Feb 2009) Log Message: ----------- Fix for the c++ test issue on Windows. win-bash doesn't run an example which has "+" in the path and where the suffix (".exe") is not appended to the filename. Omitting the suffix works perfectly for the C examples (where there is no '+' in the path), but not for the C++ examples. I added and exported the variable "exesuffix" in plplot-test.sh.cmake and only used it in test_cxx.sh.in. Modified Paths: -------------- trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_cxx.sh.in Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2009-02-17 10:14:04 UTC (rev 9535) +++ trunk/plplot_test/plplot-test.sh.cmake 2009-02-17 20:34:34 UTC (rev 9536) @@ -309,15 +309,17 @@ # Call the front-end scripts status=0 +if [ "@WIN32@" = "1" ] ; then + critical_examples="14 17" + exesuffix=".exe" +else + critical_examples="14 17 29" + exesuffix= +fi +export critical_examples exesuffix for i in $FRONT_END ; do echo "Testing front-end $i" script=$scripts_dir/test_$i.sh - if [ "@WIN32@" = "1" ] ; then - critical_examples="14 17 29" - else - critical_examples="14 17 29" - fi - export critical_examples if [ "@WIN32@" != "1" ] ; then chmod +x $script fi Modified: trunk/plplot_test/test_cxx.sh.in =================================================================== --- trunk/plplot_test/test_cxx.sh.in 2009-02-17 10:14:04 UTC (rev 9535) +++ trunk/plplot_test/test_cxx.sh.in 2009-02-17 20:34:34 UTC (rev 9536) @@ -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 -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 \ @@ -43,11 +43,11 @@ fi if [ "$index" = "14" ] ; then echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \ - $DEBUG_CMD "$cxxdir/x${index}" -dev $device -o ${OUTPUT_DIR}/x${index}cxx%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} -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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sm...@us...> - 2009-03-09 22:58:30
|
Revision: 9696 http://plplot.svn.sourceforge.net/plplot/?rev=9696&view=rev Author: smekal Date: 2009-03-09 22:58:23 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Test scripts for testing D examples. One needs to touch plplot_test/x01d.psc in the cmake build directory so that the D examples are also compared, since the x01 examples is missing so far. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_diff.sh.in Added Paths: ----------- trunk/plplot_test/test_d.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2009-03-09 22:23:53 UTC (rev 9695) +++ trunk/plplot_test/CMakeLists.txt 2009-03-09 22:58:23 UTC (rev 9696) @@ -172,7 +172,19 @@ ) endif(ENABLE_lua) - # Run C examples with different drivers + if(ENABLE_d) + configure_file( + test_d.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_d.sh + @ONLY + ) + list(APPEND SCRIPTS test_d.sh) + add_test(examples_d + ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=d" + ) + endif(ENABLE_d) + +# Run C examples with different drivers if(PLD_psc) if (NOT TEST_DEVICE STREQUAL "psc") add_test(examples_psttfc Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2009-03-09 22:23:53 UTC (rev 9695) +++ trunk/plplot_test/plplot-test.sh.cmake 2009-03-09 22:58:23 UTC (rev 9696) @@ -47,7 +47,7 @@ Options: [--device=DEVICE] (DEVICE = any cmake-enabled device. psc is the default) - [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, perl, ada, ocaml, or lua) + [--front-end=FE] (FE = one of c, cxx, f77, f95 java, octave, python, tcl, perl, ada, ocaml, lua or d) If this option is not specified, then all front-ends will be tested. More than one front-end may be given, like this --front-end="c cxx" @@ -115,6 +115,7 @@ -o $i = "ada" \ -o $i = "ocaml" \ -o $i = "lua" \ + -o $i = "d" \ ] \ || usage 0 1>&2 done @@ -169,6 +170,7 @@ adadir=$EXAMPLES_DIR/ada ocamldir=$EXAMPLES_DIR/ocaml luadir=$EXAMPLES_DIR/lua +ddir=$EXAMPLES_DIR/d octave=@OCTAVE@ octavedir=\ $EXAMPLES_DIR/../bindings/octave:\ @@ -182,7 +184,7 @@ @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 PATH +export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir PATH fe="" @@ -304,6 +306,7 @@ test "@ENABLE_ada@" = "ON" && FRONT_END="$FRONT_END ada" test "@ENABLE_ocaml@" = "ON" && FRONT_END="$FRONT_END ocaml" test "@ENABLE_lua@" = "ON" && FRONT_END="$FRONT_END lua" + test "@ENABLE_d@" = "ON" && FRONT_END="$FRONT_END d" fi # Find where the front-end scripts are by looking at the directory name of the Added: trunk/plplot_test/test_d.sh.in =================================================================== --- trunk/plplot_test/test_d.sh.in (rev 0) +++ trunk/plplot_test/test_d.sh.in 2009-03-09 22:58:23 UTC (rev 9696) @@ -0,0 +1,57 @@ +#!@SH_EXECUTABLE@ +# Test suite for D examples. +# +# Copyright (C) 2009 Werner Smekal +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Library Public License as published +# by the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +# This is called from plplot-test.sh with $ddir, $device, $dsuffix, +# $options, and possibly $verbose_test defined. + +# To build the D examples before running this script do the following: +# pushd $ddir; make; popd + +# Do the standard non-interactive examples. +lang="d" +export index lang +for index in 03 04 05 06 07 08 10 12 13; do + if [ "$verbose_test" ] ; then + 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 + # 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 + # Look for any status codes (segfaults, plexit) from the examples themselves. + status_code=$? + fi + 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 [ -n "$is_error" ] ; then + exit 1 + fi +done Property changes on: trunk/plplot_test/test_d.sh.in ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/plplot_test/test_diff.sh.in =================================================================== --- trunk/plplot_test/test_diff.sh.in 2009-03-09 22:23:53 UTC (rev 9695) +++ trunk/plplot_test/test_diff.sh.in 2009-03-09 22:58:23 UTC (rev 9696) @@ -25,8 +25,8 @@ xsuffix_c= # Compare C results with c++, f77, f95, java, octave, python, tcl, perl, -# ada, ocaml, and lua results -for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml lua; do +# ada, ocaml, lua and d results +for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml lua d; do # Check which suffix is used for this binding case $lang in @@ -78,6 +78,10 @@ xsuffix= suffix=lua ;; + d) + xsuffix= + suffix=d + ;; esac missing="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-01-04 00:52:25
|
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. |
From: <ai...@us...> - 2010-07-21 19:11:05
|
Revision: 11094 http://plplot.svn.sourceforge.net/plplot/?rev=11094&view=rev Author: airwin Date: 2010-07-21 19:10:59 +0000 (Wed, 21 Jul 2010) Log Message: ----------- Temporarily remove some examples so that test_octave_psc and test_octave_<interactive_driver> will work. Modified Paths: -------------- trunk/plplot_test/test_octave.sh.in trunk/plplot_test/test_octave_interactive.sh.in Modified: trunk/plplot_test/test_octave.sh.in =================================================================== --- trunk/plplot_test/test_octave.sh.in 2010-07-21 17:51:07 UTC (rev 11093) +++ trunk/plplot_test/test_octave.sh.in 2010-07-21 19:10:59 UTC (rev 11094) @@ -55,7 +55,9 @@ # Subset of p examples selected that seem to work ok with noninteractive # devices. -for i=[1:7 8 9 13 15 16 21] ; +# Remove 7, 16 until plshade1 fix is done. + +for i=[1:6 8 9 13 15 21] ; if (verbose_test) printf("p%d\n",i); endif Modified: trunk/plplot_test/test_octave_interactive.sh.in =================================================================== --- trunk/plplot_test/test_octave_interactive.sh.in 2010-07-21 17:51:07 UTC (rev 11093) +++ trunk/plplot_test/test_octave_interactive.sh.in 2010-07-21 19:10:59 UTC (rev 11094) @@ -70,8 +70,11 @@ # -dev xwin and -dev tk worked for all examples and Octave-3.0. For # Octave-3.2 the animation for p14 does not work correctly with these devices. +# Remove 7, 16, 20 until plshade1 fix is done. +# Remove 17 until an additional fix is done. +# Remove combined example 21. plsetopt("dev","$device"); -for i=[1:21]; +for i=[1:6 8:15 18:19]; if (verbose_test) printf("p%d\n",i); endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-03 19:37:17
|
Revision: 11363 http://plplot.svn.sourceforge.net/plplot/?rev=11363&view=rev Author: airwin Date: 2010-12-03 19:37:11 +0000 (Fri, 03 Dec 2010) Log Message: ----------- Improved handling of pltcl location that should work in a cross-platform way. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/test_tcl.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2010-12-03 17:12:56 UTC (rev 11362) +++ trunk/plplot_test/CMakeLists.txt 2010-12-03 19:37:11 UTC (rev 11363) @@ -139,14 +139,19 @@ endif(ENABLE_python) if(ENABLE_tcl) + get_target_property(pltcl_LOC pltcl LOCATION) configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY ) - list(APPEND SCRIPTS test_tcl.sh) add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) + set(pltcl_LOC ${BIN_DIR}/pltcl${EXEEXT}) + configure_file(test_tcl.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install + @ONLY + ) endif(ENABLE_tcl) if(ENABLE_pdl) @@ -394,6 +399,14 @@ RENAME plplot-test.sh ) + if(ENABLE_tcl) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install + DESTINATION ${DATA_DIR}/examples + PERMISSIONS ${PERM_SCRIPTS} + RENAME test_tcl.sh + ) + endif(ENABLE_tcl) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh DESTINATION ${DATA_DIR}/examples Modified: trunk/plplot_test/test_tcl.sh.in =================================================================== --- trunk/plplot_test/test_tcl.sh.in 2010-12-03 17:12:56 UTC (rev 11362) +++ trunk/plplot_test/test_tcl.sh.in 2010-12-03 19:37:11 UTC (rev 11363) @@ -29,9 +29,9 @@ export results cd "$tcldir" if [ "$verbose_test" ] ; then - echo "pltcl demo of plot" + echo "@pltcl_LOC@ demo of plot" fi -pltcl@EXEEXT@ -dev $device -o "$results"/plot%n.$dsuffix $options <<EOF 2> test.error +@pltcl_LOC@ -dev $device -o "$results"/plot%n.$dsuffix $options <<EOF 2> test.error plinit source plot.tcl plot stats.log {1 4} @@ -52,9 +52,9 @@ exit 1 fi if [ "$verbose_test" ] ; then - echo "pltcl demo of plgrid" + echo "@pltcl_LOC@ demo of plgrid" fi -pltcl@EXEEXT@ -dev $device -o "$results"/plgrid%n.$dsuffix $options <<EOF 2> test.error +@pltcl_LOC@ -dev $device -o "$results"/plgrid%n.$dsuffix $options <<EOF 2> test.error plinit source plgrid.tcl plgrid This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-10 21:32:04
|
Revision: 11366 http://plplot.svn.sourceforge.net/plplot/?rev=11366&view=rev Author: airwin Date: 2010-12-10 21:31:58 +0000 (Fri, 10 Dec 2010) Log Message: ----------- Transform PATH component from drive-letter form to leading-slash form. This turns out to be a necessary change on the MinGW/MSYS wine Windows platform (and probably MS Windows as well). Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test.sh.cmake Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2010-12-10 21:27:54 UTC (rev 11365) +++ trunk/plplot_test/CMakeLists.txt 2010-12-10 21:31:58 UTC (rev 11366) @@ -13,6 +13,14 @@ set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar") + # Experience with MSYS bash shows that variables used to set a PATH + # component must transform the drive letter form to the "/" Unix + # form of the PATH component. The case of the drive letter doesn't + # matter. For example converting z:/whatever/path ==> + # /z/whatever/path or /Z/whatever/path works fine for MSYS bash. + + string(REGEX REPLACE "^(.):" "/\\1/" PATH_FORM_BIN_DIR ${BIN_DIR}) + #Build-tree configuration set(CONFIGURED_EXAMPLES_DIR EXAMPLES_DIR) configure_file( Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2010-12-10 21:27:54 UTC (rev 11365) +++ trunk/plplot_test/plplot-test.sh.cmake 2010-12-10 21:31:58 UTC (rev 11366) @@ -266,7 +266,7 @@ "@PLPLOT_OCTAVE_DIR@"/support:\ "@OCTAVE_M_DIR@"/PLplot:\ "@OCTAVE_OCT_DIR@": -PATH="$EXAMPLES_DIR"/../utils:"@BIN_DIR@":"$PATH" +PATH="$EXAMPLES_DIR"/../utils:"@PATH_FORM_BIN_DIR@":"$PATH" export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir PATH fe="" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-12 02:20:04
|
Revision: 11367 http://plplot.svn.sourceforge.net/plplot/?rev=11367&view=rev Author: airwin Date: 2010-12-12 02:19:57 +0000 (Sun, 12 Dec 2010) Log Message: ----------- Improved implementation of obtaining the location of pltcl. Use completely separate locations for the build-tree and installed examples tree cases. It is absolutely necessary to set the PATH since examples/tcl/x?? executes pltcl directly (unless you want to configure all of those files), but limit the scope of PATH setting only to test_tcl.sh where it is needed to find pltcl. This implementation actually works on Linux (unlike the prior change trying to address pltcl finding issues which introduced some Linux bugs), and it is designed to work on Windows as well although it is currently not tested there. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test.sh.cmake trunk/plplot_test/test_tcl.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2010-12-10 21:31:58 UTC (rev 11366) +++ trunk/plplot_test/CMakeLists.txt 2010-12-12 02:19:57 UTC (rev 11367) @@ -1,3 +1,24 @@ +# plplot_test/CMakeLists.txt for PLplot +### +### Process this file with cmake to produce Makefile +### +# Copyright (C) 2006-2010 Alan W. Irwin +# +# This file is part of PLplot. +# +# PLplot is free software; you can redistribute it and/or modify +# it under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; version 2 of the License. +# +# PLplot is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Library General Public License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with PLplot; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + # Only set up test environment, configure test files, and install them if # a shell is available. @@ -13,14 +34,6 @@ set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar") - # Experience with MSYS bash shows that variables used to set a PATH - # component must transform the drive letter form to the "/" Unix - # form of the PATH component. The case of the drive letter doesn't - # matter. For example converting z:/whatever/path ==> - # /z/whatever/path or /Z/whatever/path works fine for MSYS bash. - - string(REGEX REPLACE "^(.):" "/\\1/" PATH_FORM_BIN_DIR ${BIN_DIR}) - #Build-tree configuration set(CONFIGURED_EXAMPLES_DIR EXAMPLES_DIR) configure_file( @@ -148,6 +161,16 @@ if(ENABLE_tcl) get_target_property(pltcl_LOC pltcl LOCATION) + string(REGEX REPLACE "/pltcl.*$" "" PLTCL_DIR ${pltcl_LOC}) + # Experience with MSYS bash shows that variables used to set a + # PATH component must transform the drive-letter form to the + # leading-slash Unix form of the PATH component. The case of the + # drive letter doesn't matter. For example converting + # z:/whatever/path ==> /z/whatever/path or /Z/whatever/path works + # fine for MSYS bash. + string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) + + configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh @ONLY @@ -155,7 +178,10 @@ add_test(examples_tcl ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=tcl" ) - set(pltcl_LOC ${BIN_DIR}/pltcl${EXEEXT}) + set(PLTCL_DIR ${BIN_DIR}) + # Transform drive-letter form to leading-slash form, see comment above. + string(REGEX REPLACE "^(.):" "/\\1/" PLTCL_DIR ${PLTCL_DIR}) + configure_file(test_tcl.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install @ONLY Modified: trunk/plplot_test/plplot-test.sh.cmake =================================================================== --- trunk/plplot_test/plplot-test.sh.cmake 2010-12-10 21:31:58 UTC (rev 11366) +++ trunk/plplot_test/plplot-test.sh.cmake 2010-12-12 02:19:57 UTC (rev 11367) @@ -266,8 +266,7 @@ "@PLPLOT_OCTAVE_DIR@"/support:\ "@OCTAVE_M_DIR@"/PLplot:\ "@OCTAVE_OCT_DIR@": -PATH="$EXAMPLES_DIR"/../utils:"@PATH_FORM_BIN_DIR@":"$PATH" -export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir PATH +export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir fe="" Modified: trunk/plplot_test/test_tcl.sh.in =================================================================== --- trunk/plplot_test/test_tcl.sh.in 2010-12-10 21:31:58 UTC (rev 11366) +++ trunk/plplot_test/test_tcl.sh.in 2010-12-12 02:19:57 UTC (rev 11367) @@ -1,7 +1,7 @@ #!@SH_EXECUTABLE@ # Test suite for Tcl examples. # -# Copyright (C) 2004 Alan W. Irwin +# Copyright (C) 2004-2010 Alan W. Irwin # Copyright (C) 2004 Rafael Laboissiere # Copyright (C) 2004 Andrew Ross # @@ -23,15 +23,17 @@ # This is called from plplot-test.sh with $tcldir, $device, $dsuffix, # $options, and possibly $verbose_test defined. +# Put pltcl on the PATH. +PATH=@PLTCL_DIR@:$PATH lang="t" cd "${OUTPUT_DIR}" results="`pwd`" export results cd "$tcldir" if [ "$verbose_test" ] ; then - echo "@pltcl_LOC@ demo of plot" + echo "@PLTCL_DIR@/pltcl demo of plot" fi -@pltcl_LOC@ -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} @@ -52,9 +54,9 @@ exit 1 fi if [ "$verbose_test" ] ; then - echo "@pltcl_LOC@ demo of plgrid" + echo "@PLTCL_DIR@/pltcl demo of plgrid" fi -@pltcl_LOC@ -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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-12-27 05:36:51
|
Revision: 11392 http://plplot.svn.sourceforge.net/plplot/?rev=11392&view=rev Author: airwin Date: 2010-12-27 05:36:44 +0000 (Mon, 27 Dec 2010) Log Message: ----------- Configure test_octave.sh(.in) to limit tests when ENABLE_swig_octave is ON. Also, use plplot_octave (for now until I can figure out how to wrap plplot_octave as the plplot_stub command) for the ENABLE_swig_octave=ON case, and the usual plplot_stub for the (default) ENABLE_swig_octave=OFF case. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/test_octave.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2010-12-27 02:00:22 UTC (rev 11391) +++ trunk/plplot_test/CMakeLists.txt 2010-12-27 05:36:44 UTC (rev 11392) @@ -70,13 +70,6 @@ ) list(APPEND SCRIPTS test_c_interactive.sh) - configure_file( - test_octave_interactive.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test_octave_interactive.sh - @ONLY - ) - list(APPEND SCRIPTS test_octave_interactive.sh) - add_test(examples_c ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=c" ) @@ -130,7 +123,22 @@ endif(ENABLE_java) if(ENABLE_octave) + if(ENABLE_swig_octave) + set(swig_octave_comment) + set(matwrap_octave_comment "# (ignore for swig-generated case) ") + else(ENABLE_swig_octave) + set(matwrap_octave_comment) + set(swig_octave_comment "# (ignore for matwrap-generated case) ") + endif(ENABLE_swig_octave) + configure_file( + test_octave_interactive.sh.in + ${CMAKE_CURRENT_BINARY_DIR}/test_octave_interactive.sh + @ONLY + ) + list(APPEND SCRIPTS test_octave_interactive.sh) + + configure_file( test_octave.sh.in ${CMAKE_CURRENT_BINARY_DIR}/test_octave.sh @ONLY Modified: trunk/plplot_test/test_octave.sh.in =================================================================== --- trunk/plplot_test/test_octave.sh.in 2010-12-27 02:00:22 UTC (rev 11391) +++ trunk/plplot_test/test_octave.sh.in 2010-12-27 05:36:44 UTC (rev 11392) @@ -42,7 +42,8 @@ verbose_test = 0; endif -plplot_stub; +@swig_octave_comment@plplot_octave; +@matwrap_octave_comment@plplot_stub; t = split("$options", "-"); if (t); t(1,:)=""; endif; for i=1:rows(t) @@ -57,7 +58,8 @@ # Remove 7, 16 until plshade1 fix is done. -for i=[1:6 8 9 13 15 21] ; +@swig_octave_comment@for i=[] ; +@matwrap_octave_comment@for i=[1:6 8 9 13 15 21] ; if (verbose_test) printf("p%d\n",i); endif @@ -68,7 +70,10 @@ #plot equivalent of x??c examples. These only required octave-2.0.x #Example 19 is not yet implemented failed = [] ; -for i=[1:18 20:31 ] ; +# Temporarily drop everything that involves arrays or returned values +# until typemaps for swig-generated interface are done. +@swig_octave_comment@for i=[10] ; +@matwrap_octave_comment@for i=[1:18 20:31 ] ; ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i); strm = fopen(ofile,"w"); cmd = sprintf("x%.2dc",i); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-10-14 05:04:08
|
Revision: 11964 http://plplot.svn.sourceforge.net/plplot/?rev=11964&view=rev Author: airwin Date: 2011-10-14 05:04:02 +0000 (Fri, 14 Oct 2011) Log Message: ----------- Sort out some issues with running the special 16a Fortran examples. Modified Paths: -------------- trunk/plplot_test/test_f77.sh.in trunk/plplot_test/test_f95.sh.in Modified: trunk/plplot_test/test_f77.sh.in =================================================================== --- trunk/plplot_test/test_f77.sh.in 2011-10-14 04:30:59 UTC (rev 11963) +++ trunk/plplot_test/test_f77.sh.in 2011-10-14 05:04:02 UTC (rev 11964) @@ -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"/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=$? cat test.error if [ "$status_code" -ne 0 ] ; then @@ -88,9 +88,10 @@ if [ "$verbose_test" ] ; then echo "x16af" fi - $DEBUG_CMD "$f77dir"/x16af <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt + index="16a" + $DEBUG_CMD "$f77dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt $device -"${OUTPUT_DIR}"/x16af%n.$dsuffix +"${OUTPUT_DIR}"/x${index}f%n.$dsuffix EOF status_code=$? cat test.error Modified: trunk/plplot_test/test_f95.sh.in =================================================================== --- trunk/plplot_test/test_f95.sh.in 2011-10-14 04:30:59 UTC (rev 11963) +++ trunk/plplot_test/test_f95.sh.in 2011-10-14 05:04:02 UTC (rev 11964) @@ -40,7 +40,8 @@ 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 + index="16a" + $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=$? cat test.error if [ "$status_code" -ne 0 ] ; then @@ -88,9 +89,10 @@ if [ "$verbose_test" ] ; then echo "x16af" fi - $DEBUG_CMD "$f95dir"/x16af <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt + index="16a" + $DEBUG_CMD "$f95dir"/x${index}f <<EOF 2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${dsuffix}.txt $device -"${OUTPUT_DIR}"/x16af95%n.$dsuffix +"${OUTPUT_DIR}"/x${index}f95%n.$dsuffix EOF status_code=$? cat test.error This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-01-28 19:27:12
|
Revision: 12161 http://plplot.svn.sourceforge.net/plplot/?rev=12161&view=rev Author: andrewross Date: 2012-01-28 19:27:06 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Change split -> strsplit in octave test scripts as required for octave 3.6. Modified Paths: -------------- trunk/plplot_test/test_octave.sh.in trunk/plplot_test/test_octave_interactive.sh.in Modified: trunk/plplot_test/test_octave.sh.in =================================================================== --- trunk/plplot_test/test_octave.sh.in 2012-01-27 22:29:16 UTC (rev 12160) +++ trunk/plplot_test/test_octave.sh.in 2012-01-28 19:27:06 UTC (rev 12161) @@ -45,7 +45,7 @@ endif plplot_stub; -t = split("$options", "-"); +t = char(strsplit("$options", "-")); if (t); t(1,:)=""; endif; for i=1:rows(t) tt = deblank (t(i,:)); len = length(tt); @@ -83,7 +83,7 @@ if (verbose_test) printf("%s\n",cmd); endif - t = split("$options", "-"); + t = char(strsplit("$options", "-")); if (t) ; t(1,:)=""; endif for j=1:rows(t) tt = deblank (t(j,:)); len = length(tt); Modified: trunk/plplot_test/test_octave_interactive.sh.in =================================================================== --- trunk/plplot_test/test_octave_interactive.sh.in 2012-01-27 22:29:16 UTC (rev 12160) +++ trunk/plplot_test/test_octave_interactive.sh.in 2012-01-28 19:27:06 UTC (rev 12161) @@ -42,7 +42,7 @@ endif plplot_stub; -t = split("$options", "-"); +t = char(strsplit("$options", "-")); if (t); t(1,:)=""; endif; for i=1:rows(t) tt = deblank (t(i,:)); len = length(tt); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-11-29 01:16:54
|
Revision: 12778 http://sourceforge.net/p/plplot/code/12778 Author: airwin Date: 2013-11-29 01:16:49 +0000 (Fri, 29 Nov 2013) Log Message: ----------- Add many more interactive tests (-dev ntk, pltcl_standard_examples, tclsh_standard_examples, wish_standard_examples, plserver_runAllDemos, and wish_runAllDemos) to traditional (Makefile + pkg-config) build and test of the installed examples tree. Tested by Alan W. Irwin <ai...@us...> on Linux running "make install" for the core build and then changing directory to the installed examples and running "make test_interactive" (which uses the traditional build system for those examples. This was done with all tests mentioned above enabled one-by-one (to deal with some known issues for those tests). For this commit, the ones with the known issues (wish_standard_examples, plserver_runAllDemos, and wish_runAllDemos) have been temporarily disabled until those issues are fixed. Modified Paths: -------------- trunk/plplot_test/CMakeLists.txt trunk/plplot_test/plplot-test-interactive.sh.in Modified: trunk/plplot_test/CMakeLists.txt =================================================================== --- trunk/plplot_test/CMakeLists.txt 2013-11-28 19:19:04 UTC (rev 12777) +++ trunk/plplot_test/CMakeLists.txt 2013-11-29 01:16:49 UTC (rev 12778) @@ -50,6 +50,30 @@ @ONLY ) + # Set up optional tests in the configured plplot-test-interactive.sh file. + + set(pkgIndex_LOCATION ${DATA_DIR}) + set(SHELL_TEST_PLTCL_STANDARD_EXAMPLES 1) + set(SHELL_TEST_PLSERVER_STANDARD_EXAMPLES 1) + # FIXME. Currently plserver_runAllDemos needs work so drop it for now. + set(SHELL_TEST_PLSERVER_RUNALLDEMOS 0) + + # All Tcl/Tk tests that use the "package require" approach only + # work with shared libraries. + if(BUILD_SHARED_LIBS) + set(SHELL_TEST_TCLSH_STANDARD_EXAMPLES 1) + # FIXME. Currently wish_standard_examples segfaults on exit. So + # drop it for now. + set(SHELL_TEST_WISH_STANDARD_EXAMPLES 0) + # FIXME. Currently the wish_runAllDemos needs work and also has + # an intermittent bug (x?? not recognized as a command). + set(SHELL_TEST_WISH_RUNALLDEMOS 0) + else(BUILD_SHARED_LIBS) + set(SHELL_TEST_TCLSH_STANDARD_EXAMPLES 0) + set(SHELL_TEST_WISH_STANDARD_EXAMPLES 0) + set(SHELL_TEST_WISH_RUNALLDEMOS 0) + endif(BUILD_SHARED_LIBS) + configure_file( plplot-test-interactive.sh.in ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh Modified: trunk/plplot_test/plplot-test-interactive.sh.in =================================================================== --- trunk/plplot_test/plplot-test-interactive.sh.in 2013-11-28 19:19:04 UTC (rev 12777) +++ trunk/plplot_test/plplot-test-interactive.sh.in 2013-11-29 01:16:49 UTC (rev 12778) @@ -99,6 +99,7 @@ PLD_xwin=@PLD_xwin@ PLD_tk=@PLD_tk@ +PLD_ntk=@PLD_ntk@ PLD_xcairo=@PLD_xcairo@ PLD_gcw=@PLD_gcw@ PLD_wxwidgets=@PLD_wxwidgets@ @@ -108,7 +109,7 @@ # These blank-delimited strings must be consistent with previous configured # list of devices. -POSSIBLE_INTERACTIVE_DEVICES_LIST="xwin tk xcairo gcw wxwidgets qtwidget" +POSSIBLE_INTERACTIVE_DEVICES_LIST="xwin tk ntk xcairo gcw wxwidgets qtwidget" POSSIBLE_DEVICES_LIST="$POSSIBLE_INTERACTIVE_DEVICES_LIST extcairo extqt" # Default DEVICES_LIST is all eligible devices if environment variable @@ -256,6 +257,7 @@ done if [ "@ENABLE_tk@" = "ON" ] ; then + cd "${SRC_EXAMPLES_DIR}"/tcl plserver <<EOF plstdwin . @@ -267,13 +269,156 @@ exit EOF -# Just in case EXAMPLES_DIR is a relative path such as the default ".". - cd .. - cd "${EXAMPLES_DIR}"/tk -# Drop 14 because multiple devices do not seem to work in this context. -# Drop 31 since it produces empty plot (by design). - plserver <<EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for plgrid example" + OVERALL_STATUS_CODE=$status_code + fi + + # OPTIONAL tests. + TEST_PLTCL_STANDARD_EXAMPLES=@SHELL_TEST_PLTCL_STANDARD_EXAMPLES@ + TEST_TCLSH_STANDARD_EXAMPLES=@SHELL_TEST_TCLSH_STANDARD_EXAMPLES@ + TEST_PLSERVER_STANDARD_EXAMPLES=@SHELL_TEST_PLSERVER_STANDARD_EXAMPLES@ + TEST_WISH_STANDARD_EXAMPLES=@SHELL_TEST_WISH_STANDARD_EXAMPLES@ + TEST_PLSERVER_RUNALLDEMOS=@SHELL_TEST_PLSERVER_RUNALLDEMOS@ + TEST_WISH_RUNALLDEMOS=@SHELL_TEST_WISH_RUNALLDEMOS@ + + if [ "$TEST_PLTCL_STANDARD_EXAMPLES" -ne 0 ] ; then + # Copied almost entirely from pltcl_standard_examples script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tcl + # Drop 14 because multiple devices do not seem to work in this context. + # Drop 31 since it produces empty plot (by design). + # Drop 32 since it has not been propagated (for the present by + # design) from C. + pltcl <<EOF +source tcldemos.tcl +plsdev "xwin" +plinit +# Disable pausing. +plspause 0 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +#14 +15 +16 +17 +18 +19 +20 +plspause 0 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +#31 +#32 +33 +exit +EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for pltcl_standard_examples." + OVERALL_STATUS_CODE=$status_code + fi + fi + + if [ "$TEST_TCLSH_STANDARD_EXAMPLES" -ne 0 ] ; then + # Copied almost entirely from TCLSH_standard_examples script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tcl + # Drop 14 because multiple devices do not seem to work in this context. + # Drop 31 since it produces empty plot (by design). + # Drop 32 since it has not been propagated (for the present by + # design) from C. + tclsh <<EOF +lappend auto_path @pkgIndex_LOCATION@ +package require Pltcl +source tcldemos.tcl +plsdev "xwin" +plinit +# Disable pausing. +plspause 0 +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +#14 +15 +16 +17 +18 +19 +20 +plspause 0 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +#31 +#32 +33 +exit +EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for tclsh_standard_examples." + OVERALL_STATUS_CODE=$status_code + fi + fi + + if [ "$TEST_PLSERVER_STANDARD_EXAMPLES" -ne 0 ] ; then + # Copied almost entirely from plserver_standard_examples script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tk + # Drop 14 because multiple devices do not seem to work in this context. + # Drop 31 since it produces empty plot (by design). + # Drop 32 since it has not been propagated (for the present by + # design) from C. + plserver <<EOF source tkdemos.tcl +plw::set_pause .plw 0 +0 1 2 3 @@ -287,6 +432,7 @@ 11 12 13 +#14 15 16 17 @@ -303,9 +449,116 @@ 28 29 30 +#31 +#32 +33 exit EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for plserver_standard_examples" + OVERALL_STATUS_CODE=$status_code + fi + fi + if [ "$TEST_WISH_STANDARD_EXAMPLES" -ne 0 ] ; then + # Copied almost entirely from wish_standard_examples script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tk + # Drop 14 because multiple devices do not seem to work in this context. + # Drop 31 since it produces empty plot (by design). + # Drop 32 since it has not been propagated (for the present by + # design) from C. + # Both examples 2 ("Couldn't parse color 76") and 24 ("illegal + # number of colors in cmap0: red") error out so we comment out + # those examples for now. Example 20 enables plspause so + # we comment that out for now. + wish <<EOF +lappend auto_path @pkgIndex_LOCATION@ +package require Pltk +source tkdemos.tcl +# Note wish currently disables pauses so no special method is +# required to do that (unlike the plserver case). +0 +1 +#2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +#14 +15 +16 +17 +18 +19 +#20 +21 +22 +23 +#24 +25 +26 +27 +28 +29 +30 +#31 +#32 +33 +exit +EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for wish_standard_examples" + OVERALL_STATUS_CODE=$status_code + fi + fi + + if [ "$TEST_PLSERVER_RUNALLDEMOS" -ne 0 ] ; then + # Copied almost entirely from plserver_runAllDemos script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tk + plserver <<EOF +source runAllDemos.tcl +EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for plserver_runAllDemos." + OVERALL_STATUS_CODE=$status_code + fi + fi + + if [ "$TEST_WISH_RUNALLDEMOS" -ne 0 ] ; then + # Copied almost entirely from wish_runAllDemos script. + cd .. + # Just in case EXAMPLES_DIR is a relative path such as the default ".". + cd "${EXAMPLES_DIR}"/tk + wish <<EOF +lappend auto_path @pkgIndex_LOCATION@ +package require Plplotter +source runAllDemos.tcl +EOF + # Look for any status codes (segfaults or whatever) + status_code=$? + if [ "$status_code" -ne 0 ] ; then + echo "ERROR indicated by status code = $status_code for wish_runAllDemos." + OVERALL_STATUS_CODE=$status_code + fi + fi fi + if [ "$OVERALL_STATUS_CODE" -ne 0 ] ; then echo "A major error occurred for one of the interactive examples" else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |