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

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

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.