rpms/plplot/devel plplot-5.9.5-test.patch, NONE, 1.1 plplot-5.9.3-test.patch, 1.1, NONE

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31121

Added Files:
	plplot-5.9.5-test.patch 
Removed Files:
	plplot-5.9.3-test.patch 
Log Message:
Update the patch


plplot-5.9.5-test.patch:
 plplot-test.sh.cmake |   45 ++++++++++++++-------------------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE plplot-5.9.5-test.patch ---
--- plplot-5.9.4/plplot_test/plplot-test.sh.cmake.test	2009-08-26 13:43:29.454693200 -0600
+++ plplot-5.9.4/plplot_test/plplot-test.sh.cmake	2009-08-26 13:46:14.464631523 -0600
@@ -35,8 +35,9 @@
 
 version=@VERSION@
 
-EXAMPLES_DIR=${EXAMPLES_DIR:-.}
-SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.}
+EXE_DIR=`dirname $0`
+EXAMPLES_DIR=${EXAMPLES_DIR:=$EXE_DIR}
+SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:=$EXE_DIR}
 OUTPUT_DIR=${OUTPUT_DIR:-.}
 device=${DEVICE:-psc}
 export EXAMPLES_DIR SRC_EXAMPLES_DIR OUTPUT_DIR device DEBUG_CMD
@@ -148,18 +149,6 @@
    shift
 done
 
-# 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
-echo '
-This script is only designed to work when the EXAMPLES_DIR environment
-variable (overridden by option --examples-dir) is a directory with a
-subdirectory called "c".  This condition has been violated.
-'
-exit 1
-fi
-
 # These variables set by default assuming you are going to run this
 # script from the installed demos directory $prefix/lib/plplot$version/examples.
 cdir=$EXAMPLES_DIR/c
@@ -295,21 +284,18 @@
 dsuffix=$device
 export dsuffix options
 
-# Find out what front-ends have been configured
+# Find out what front-ends have been configured and installed
 if [ -z "$FRONT_END" ] ; then
-   FRONT_END=c
-   test "@ENABLE_cxx@" = "ON" && FRONT_END="$FRONT_END cxx"
-   test "@ENABLE_f77@" = "ON"    && FRONT_END="$FRONT_END f77"
-   test "@ENABLE_f95@" = "ON"    && FRONT_END="$FRONT_END f95"
-   test "@ENABLE_java@" = "ON"   && FRONT_END="$FRONT_END java"
-   test "@ENABLE_octave@" = "ON" && FRONT_END="$FRONT_END octave"
-   test "@ENABLE_python@" = "ON" && FRONT_END="$FRONT_END python"
-   test "@ENABLE_tcl@" = "ON"    && FRONT_END="$FRONT_END tcl"
-   test "@ENABLE_pdl@" = "ON"    && FRONT_END="$FRONT_END pdl"
-   test "@ENABLE_ada@" = "ON"    && FRONT_END="$FRONT_END ada"
-   test "@ENABLE_ocaml@" = "ON"  && FRONT_END="$FRONT_END ocaml"
-   test "@ENABLE_lua@" = "ON"  && FRONT_END="$FRONT_END lua"
-   test "@ENABLE_d@" = "ON"  && FRONT_END="$FRONT_END d"
+   for front_end_status in c:@ENABLE_c@ cxx:@ENABLE_cxx@ f77:@ENABLE_f77@ \
+                           f95:@ENABLE_f95@ java:@ENABLE_java@ \
+                           octave:@ENABLE_octave@ python:@ENABLE_python@ \
+                           tcl:@ENABLE_tcl@ perl:@ENABLE_pdl@ \
+                           ada:@ENABLE_ada@ ocaml:@ENABLE_ocaml@ \
+                           lua:@ENABLE_lua@ d:@ENABLE_d@
+   do
+      front_end=${front_end_status/:ON/}
+      [ $front_end != $front_end_status ] && [ -d $EXAMPLES_DIR/$front_end ] && FRONT_END="$FRONT_END $front_end"
+   done
 fi
 
 # Find where the front-end scripts are by looking at the directory name of the
@@ -335,9 +321,6 @@
 for i in $FRONT_END ; do
    echo "Testing front-end $i"
    script=$scripts_dir/test_$i.sh
-   if [ "@WIN32@" != "1" ] ; then
-      chmod +x $script
-   fi
    @SH_EXECUTABLE@ $script || status=1
 done
 


--- plplot-5.9.3-test.patch DELETED ---