[Plplot-cvs] SF.net SVN: plplot:[9202] trunk

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

Revision: 9202
          http://plplot.svn.sourceforge.net/plplot/?rev=9202&view=rev
Author:   airwin
Date:     2008-12-19 08:18:18 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Drop tee_cmd approach to capturing stdout from each command
and simply replace it with ">|" to write stdout to a file directly.

This change stops cluttering ctest --verbose output with individual stdout
results from every command that is run. It also fixes a bug where the
status was not getting propagated properly because the tee command was
interfering.

Modified Paths:
--------------
    trunk/cmake/modules/plplot.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/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/cmake/modules/plplot.cmake	2008-12-19 08:18:18 UTC (rev 9202)
@@ -77,12 +77,6 @@
 # bindings.
 find_program(DIFF_EXECUTABLE diff)
 find_program(TAIL_EXECUTABLE tail)
-find_program(TEE_EXECUTABLE tee)
-if(TEE_EXECUTABLE)
-  set(TEE_CMD "| ${TEE_EXECUTABLE} ")
-else(TEE_EXECUTABLE)
-  set(TEE_CMD "> ")
-endif(TEE_EXECUTABLE)
 
 
 option(PREBUILD_DIST "Pre-build all components required for distribution" OFF)

Modified: trunk/plplot_test/test_ada.sh.in
===================================================================
--- trunk/plplot_test/test_ada.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_ada.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -40,7 +40,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}"
   fi
-  $adadir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
   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-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_c.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -37,7 +37,7 @@
     echo "x${index}${lang}"
   fi
   $DEBUG_CMD $cdir/x${index}${lang} -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-    $options 2> test.error @TEE_CMD@ ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
   # Look for any status codes (segfaults, plexit) from the examples themselves.
   status_code=$?
   cat test.error

Modified: trunk/plplot_test/test_cxx.sh.in
===================================================================
--- trunk/plplot_test/test_cxx.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_cxx.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -42,7 +42,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}"
   fi
-  $DEBUG_CMD $cxxdir/x${index} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error @TEE_CMD@ ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+  $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=$?
   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-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_f77.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -59,7 +59,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}f"
   fi
-    $DEBUG_CMD $f77dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
     cat test.error
     if [ "$status_code" -ne 0 ]; then
@@ -82,7 +82,7 @@
   if [ "$verbose_test" ]; then
     echo "x16af"
   fi
-  $DEBUG_CMD $f77dir/x16af <<EOF 2> test.error @TEE_CMD@ ${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 
 EOF
@@ -104,7 +104,7 @@
     if [ "$verbose_test" ]; then
       echo "x${index}f"
     fi
-     $DEBUG_CMD $f77dir/x${index}f <<EOF 2> test.error @TEE_CMD@ ${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
 EOF

Modified: trunk/plplot_test/test_f95.sh.in
===================================================================
--- trunk/plplot_test/test_f95.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_f95.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -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 @TEE_CMD@ ${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,7 +60,7 @@
     if [ "$verbose_test" ]; then
       echo "x${index}f"
     fi
-    $DEBUG_CMD $f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
     cat test.error
     if [ "$status_code" -ne 0 ]; then
@@ -82,7 +82,7 @@
   if [ "$verbose_test" ]; then
     echo "x16af"
   fi
-  $DEBUG_CMD $f95dir/x16af <<EOF 2> test.error @TEE_CMD@ ${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
 EOF
@@ -105,7 +105,7 @@
     if [ "$verbose_test" ]; then
       echo "x${index}f"
     fi
-     $DEBUG_CMD $f95dir/x${index}f <<EOF 2> test.error @TEE_CMD@ ${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
 EOF

Modified: trunk/plplot_test/test_java.sh.in
===================================================================
--- trunk/plplot_test/test_java.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_java.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -49,9 +49,9 @@
     echo "x${index}"
   fi
   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 @TEE_CMD@ ${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
   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 @TEE_CMD@ ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+    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
   fi
   status_code=$?
   cat test.error

Modified: trunk/plplot_test/test_ocaml.sh.in
===================================================================
--- trunk/plplot_test/test_ocaml.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_ocaml.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -29,7 +29,7 @@
     echo "x${index}ocaml"
   fi
   $ocamldir/x${index}ocaml -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix \
-    $options 2> test.error @TEE_CMD@ ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
+    $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
   # Look for any status codes (segfaults, plexit) from the examples themselves.
   status_code=$?
   cat test.error

Modified: trunk/plplot_test/test_perl.sh.in
===================================================================
--- trunk/plplot_test/test_perl.sh.in	2008-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_perl.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -50,7 +50,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}.pl"
   fi
-  $perldir/x${index}.pl -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
   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-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_python.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -37,7 +37,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}"
   fi
-  @PYTHON_EXECUTABLE@ $pythondir/x$index -dev $device -o ${OUTPUT_DIR}/x${index}${lang}%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
   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-12-19 07:38:51 UTC (rev 9201)
+++ trunk/plplot_test/test_tcl.sh.in	2008-12-19 08:18:18 UTC (rev 9202)
@@ -79,7 +79,7 @@
   if [ "$verbose_test" ]; then
     echo "x${index}"
   fi
-  ./x${index} -dev $device -o $results/x${index}${lang}%n.$dsuffix $options 2> test.error @TEE_CMD@ ${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=$?
   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.