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

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

Revision: 9536
          http://plplot.svn.sourceforge.net/plplot/?rev=9536&view=rev
Author:   smekal
Date:     2009-02-17 20:34:34 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
Fix for the c++ test issue on Windows. win-bash doesn't run an example which has "+" in the path and where the suffix (".exe") is not appended to the filename. Omitting the suffix works perfectly for the C examples (where there is no '+' in the path), but not for the C++ examples. I added and exported the variable "exesuffix" in plplot-test.sh.cmake and only used it in test_cxx.sh.in.

Modified Paths:
--------------
    trunk/plplot_test/plplot-test.sh.cmake
    trunk/plplot_test/test_cxx.sh.in

Modified: trunk/plplot_test/plplot-test.sh.cmake
===================================================================
--- trunk/plplot_test/plplot-test.sh.cmake	2009-02-17 10:14:04 UTC (rev 9535)
+++ trunk/plplot_test/plplot-test.sh.cmake	2009-02-17 20:34:34 UTC (rev 9536)
@@ -309,15 +309,17 @@
 # Call the front-end scripts
 status=0
 
+if [ "@WIN32@" = "1" ] ; then
+ critical_examples="14 17"
+ exesuffix=".exe"
+else
+ critical_examples="14 17 29"
+ exesuffix= 
+fi
+export critical_examples exesuffix
 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 29"
-   else
-     critical_examples="14 17 29"
-   fi
-   export critical_examples
    if [ "@WIN32@" != "1" ] ; then
       chmod +x $script
    fi

Modified: trunk/plplot_test/test_cxx.sh.in
===================================================================
--- trunk/plplot_test/test_cxx.sh.in	2009-02-17 10:14:04 UTC (rev 9535)
+++ trunk/plplot_test/test_cxx.sh.in	2009-02-17 20:34:34 UTC (rev 9536)
@@ -33,7 +33,7 @@
 # x01cc is a C++ alternative that has no corresponding examples for the
 # other front ends.
 index=01c
-$DEBUG_CMD $cxxdir/x01cc -dev $device -o ${OUTPUT_DIR}/x01cc%n.$dsuffix $options
+$DEBUG_CMD $cxxdir/x01cc${exesuffix} -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 15 16 18 19 20 \
@@ -43,11 +43,11 @@
     fi
     if [ "$index" = "14" ] ; then
 	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$DEBUG_CMD "$cxxdir/x${index}" -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix \
+	$DEBUG_CMD $cxxdir/x${index}${exesuffix} -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
+	$DEBUG_CMD $cxxdir/x${index}${exesuffix} -dev $device -o ${OUTPUT_DIR}/x${index}cxx%n.$dsuffix $options 2> test.error >| ${OUTPUT_DIR}/x${index}${lang}_${dsuffix}.txt
 	status_code=$?
     fi
     cat test.error


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