[Plplot-cvs] SF.net SVN: plplot:[11365] trunk/scripts/comprehensive_test.sh

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

Revision: 11365
          http://plplot.svn.sourceforge.net/plplot/?rev=11365&view=rev
Author:   airwin
Date:     2010-12-10 21:27:54 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
Put the installed driversd directory on the PATH for the installed
examples case.

Modified Paths:
--------------
    trunk/scripts/comprehensive_test.sh

Modified: trunk/scripts/comprehensive_test.sh
===================================================================
--- trunk/scripts/comprehensive_test.sh	2010-12-09 09:07:08 UTC (rev 11364)
+++ trunk/scripts/comprehensive_test.sh	2010-12-10 21:27:54 UTC (rev 11365)
@@ -34,7 +34,13 @@
 Each of the steps in this comprehensive test may take a while...."
 
     PATH_SAVE=$PATH
-    if [ "$CMAKE_BUILD_TYPE_OPTION" = "-DBUILD_SHARED_LIBS=ON" -a \( "$generator_string" = "MinGW Makefiles" -o "$generator_string" = "MSYS Makefiles" \) ] ; then
+    if [ "$generator_string" = "MinGW Makefiles" -o "$generator_string" = "MSYS Makefiles" ] ; then
+	MINGW_OR_MSYS="true"
+    else
+	MINGW_OR_MSYS="false"
+    fi
+
+    if [ "$CMAKE_BUILD_TYPE_OPTION" = "-DBUILD_SHARED_LIBS=ON" -a "$MINGW_OR_MSYS" = "true" ] ; then
 	PATH=$PATH_SAVE:$BUILD_TREE/dll
     fi
     mkdir -p "$OUTPUT_TREE"
@@ -98,6 +104,14 @@
 			ctest --extra-verbose >& "$output" &
 		    fi
 		    PATH="$INSTALL_TREE/bin":$PATH_SAVE
+		    if [ "$MINGW_OR_MSYS" = "true" ] ; then
+			# Use this logic to be as version-independent as possible.
+			current_dir=$(pwd)
+			# Wild cards must not be inside quotes.
+			cd "$INSTALL_TREE"/lib/plplot?.?.?*/drivers*
+			PATH="$(pwd):$PATH"
+			cd $current_dir
+		    fi
 		    if [ "$do_test_install_tree" = "yes" ] ; then
 			rm -rf "$INSTALL_BUILD_TREE"
 			mkdir -p "$INSTALL_BUILD_TREE"


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