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

[<and...@us...>]

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.