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

[<sm...@us...>]

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.