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

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

Revision: 10777
          http://plplot.svn.sourceforge.net/plplot/?rev=10777&view=rev
Author:   airwin
Date:     2010-01-29 23:08:29 +0000 (Fri, 29 Jan 2010)

Log Message:
-----------
Commit changes so that the test_interactive target will work for the case
where blanks are embedded in directory names.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt
    trunk/plplot_test/plplot-test-interactive.sh.in
    trunk/plplot_test/test_c_interactive.sh.in

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2010-01-29 22:20:06 UTC (rev 10776)
+++ trunk/examples/CMakeLists.txt	2010-01-29 23:08:29 UTC (rev 10777)
@@ -582,9 +582,10 @@
       endif(ENABLE_DYNDRIVERS)
       add_custom_target(test_c_${device}
 	COMMAND ${CMAKE_COMMAND} -E echo "Generate C results for ${device} interactive device"
-	COMMAND ${custom_env} ${custom_test_command} --verbose --interactive --device=${device}
+	COMMAND env ${custom_env} ${custom_test_command} --verbose --interactive --device=${device}
 	DEPENDS
 	${interactive_device_depends_${device}}
+	VERBATIM
 	)
       if(device STREQUAL "tk")
 	if(CORE_BUILD)

Modified: trunk/plplot_test/plplot-test-interactive.sh.in
===================================================================
--- trunk/plplot_test/plplot-test-interactive.sh.in	2010-01-29 22:20:06 UTC (rev 10776)
+++ trunk/plplot_test/plplot-test-interactive.sh.in	2010-01-29 23:08:29 UTC (rev 10777)
@@ -85,7 +85,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
@@ -151,7 +151,7 @@
 for device in $INTERACTIVE_DEVICES_LIST ; do
     for index in $INDEX_LIST ; do
 	echo "${EXAMPLES_DIR}/c/x${index}c -dev $device"
-	${EXAMPLES_DIR}/c/x${index}c -dev $device 2> test.error
+	"${EXAMPLES_DIR}"/c/x${index}c -dev $device 2> test.error
 	# Look for any status codes (segfaults, plexit) from the examples themselves
 	status_code=$?
 	if [ "$status_code" -ne 0 ] ; then
@@ -272,7 +272,7 @@
 done
 
 if [ "@ENABLE_tk@" = "ON" ] ; then
-    cd ${SRC_EXAMPLES_DIR}/tcl
+    cd "${SRC_EXAMPLES_DIR}"/tcl
     plserver <<EOF
 plstdwin .
 plxframe .plw
@@ -282,7 +282,7 @@
 1
 exit
 EOF
-    cd ${EXAMPLES_DIR}/tk
+    cd "${EXAMPLES_DIR}"/tk
     pwd
 # Drop 14 because multiple devices do not seem to work in this context.
 # Drop 31 since it produces empty plot (by design).

Modified: trunk/plplot_test/test_c_interactive.sh.in
===================================================================
--- trunk/plplot_test/test_c_interactive.sh.in	2010-01-29 22:20:06 UTC (rev 10776)
+++ trunk/plplot_test/test_c_interactive.sh.in	2010-01-29 23:08:29 UTC (rev 10777)
@@ -30,7 +30,7 @@
     if [ "$verbose_test" ] ; then
 	echo "x${index}${lang}"
     fi
-    $DEBUG_CMD $cdir/x${index}${lang} -dev $device \
+    $DEBUG_CMD "$cdir"/x${index}${lang} -dev $device \
 	2> test.error >| "${OUTPUT_DIR}"/x${index}${lang}_${device}.txt
     # Look for any status codes (segfaults, plexit) from the examples
     # themselves.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.