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

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

Revision: 10081
          http://plplot.svn.sourceforge.net/plplot/?rev=10081&view=rev
Author:   airwin
Date:     2009-06-28 01:01:56 +0000 (Sun, 28 Jun 2009)

Log Message:
-----------
Change plplot-test.sh so that the front-end name "perl" is replaced by "pdl"
to be consistent with our cmake usage (e.g., ENABLE_pdl, rather than
ENABLE_perl).  This makes the new build system logic for the installed
examples a bit more straightforward.

Modified Paths:
--------------
    trunk/examples/Makefile.examples.in
    trunk/plplot_test/CMakeLists.txt
    trunk/plplot_test/plplot-test.sh.cmake

Added Paths:
-----------
    trunk/plplot_test/test_pdl.sh.in

Removed Paths:
-------------
    trunk/plplot_test/test_perl.sh.in

Modified: trunk/examples/Makefile.examples.in
===================================================================
--- trunk/examples/Makefile.examples.in	2009-06-28 00:56:41 UTC (rev 10080)
+++ trunk/examples/Makefile.examples.in	2009-06-28 01:01:56 UTC (rev 10081)
@@ -141,7 +141,7 @@
 
 @PSC...@x0...c: perl/x01.pl
 @PSC_PERL_COMMENT@	@echo Generate Perl/PDL results for psc device
-@PSC_PERL_COMMENT@	./plplot-test.sh --verbose --front-end=perl --device=psc
+@PSC_PERL_COMMENT@	./plplot-test.sh --verbose --front-end=pdl --device=psc
 @PSC_PERL_COMMENT@test_noninteractive: x01pdl.psc
 @PSC_PERL_COMMENT@@COMPARE_COMMENT@compare: x01pdl.psc
 

Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt	2009-06-28 00:56:41 UTC (rev 10080)
+++ trunk/plplot_test/CMakeLists.txt	2009-06-28 01:01:56 UTC (rev 10081)
@@ -136,13 +136,13 @@
 
   if(ENABLE_pdl)
     configure_file(
-      test_perl.sh.in
-      ${CMAKE_CURRENT_BINARY_DIR}/test_perl.sh
+      test_pdl.sh.in
+      ${CMAKE_CURRENT_BINARY_DIR}/test_pdl.sh
       @ONLY
       )
-    list(APPEND SCRIPTS test_perl.sh)
-    add_test(examples_perl
-      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=perl"
+    list(APPEND SCRIPTS test_pdl.sh)
+    add_test(examples_pdl
+      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT_DEVICE} --front-end=pdl"
       )
   endif(ENABLE_pdl)
 

Modified: trunk/plplot_test/plplot-test.sh.cmake
===================================================================
--- trunk/plplot_test/plplot-test.sh.cmake	2009-06-28 00:56:41 UTC (rev 10080)
+++ trunk/plplot_test/plplot-test.sh.cmake	2009-06-28 01:01:56 UTC (rev 10081)
@@ -47,7 +47,7 @@
 
 Options:
    [--device=DEVICE] (DEVICE = any cmake-enabled device.  psc is the default)
-   [--front-end=FE]  (FE = one of c, cxx, f77, f95 java, octave, python, tcl, perl, ada, ocaml, lua or d)
+   [--front-end=FE]  (FE = one of c, cxx, f77, f95 java, octave, python, tcl, pdl, ada, ocaml, lua or d)
                      If this option is not specified, then all front-ends will
                      be tested.  More than one front-end may be given, like
                      this --front-end="c cxx"
@@ -111,7 +111,7 @@
              -o $i = "octave" \
              -o $i = "python" \
              -o $i = "tcl"    \
-             -o $i = "perl"    \
+             -o $i = "pdl"    \
              -o $i = "ada"    \
              -o $i = "ocaml"    \
              -o $i = "lua"    \
@@ -302,7 +302,7 @@
    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 perl"
+   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"

Copied: trunk/plplot_test/test_pdl.sh.in (from rev 10066, trunk/plplot_test/test_perl.sh.in)
===================================================================
--- trunk/plplot_test/test_pdl.sh.in	                        (rev 0)
+++ trunk/plplot_test/test_pdl.sh.in	2009-06-28 01:01:56 UTC (rev 10081)
@@ -0,0 +1,70 @@
+#!@SH_EXECUTABLE@
+# Test suite for perl examples.
+#
+# Copyright (C) 2004  Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Library Public License as published
+# by the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# This is called from plplot-test.sh with $perldir, $device, $dsuffix,
+# $options, and possibly $verbose_test defined.
+
+# To build the c examples before running this script do the following:
+# pushd $cdir; make; popd
+
+# Do the standard non-interactive examples.
+
+# Ensure correct version of the libraries are picked up in both the build
+# tree and install tree.
+lang="pdl"
+if [ "$LD_LIBRARY_PATH" = "" ] ; then
+    export LD_LIBRARY_PATH=../src:@LIB_DIR@
+else
+    export LD_LIBRARY_PATH=../src:@LIB_DIR@:$LD_LIBRARY_PATH
+fi
+
+if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" = "ON" ] ; then
+    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
+else
+  # Examples 02, 20, 21, 23, 24, 28, 29, and 30 require PDL::Graphics::PLplot
+  # version 0.46 or later.
+    INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 25 26 27"
+fi
+
+for index in $INDEX_LIST ; do
+    if [ "$verbose_test" ] ; then
+	echo "x${index}.pl"
+    fi
+    if [ "$index" = "14" ] ; then
+	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
+	$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=$?
+    else
+	$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=$?
+    fi
+    cat test.error
+    if [ "$status_code" -ne 0 ] ; then
+	exit $status_code
+    fi
+  # Look for any PLPLOT ERROR messages from plwarn that do not result in an
+  # exit code.
+    is_error=`grep -l 'PLPLOT ERROR' test.error`
+    if [ -n "$is_error" ] ; then
+	exit 1
+    fi
+done


Property changes on: trunk/plplot_test/test_pdl.sh.in
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/plplot_test/test_perl.sh.in
===================================================================
--- trunk/plplot_test/test_perl.sh.in	2009-06-28 00:56:41 UTC (rev 10080)
+++ trunk/plplot_test/test_perl.sh.in	2009-06-28 01:01:56 UTC (rev 10081)
@@ -1,70 +0,0 @@
-#!@SH_EXECUTABLE@
-# Test suite for perl examples.
-#
-# Copyright (C) 2004  Alan W. Irwin
-#
-# This file is part of PLplot.
-#
-# PLplot is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Library Public License as published
-# by the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PLplot is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with PLplot; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-# This is called from plplot-test.sh with $perldir, $device, $dsuffix,
-# $options, and possibly $verbose_test defined.
-
-# To build the c examples before running this script do the following:
-# pushd $cdir; make; popd
-
-# Do the standard non-interactive examples.
-
-# Ensure correct version of the libraries are picked up in both the build
-# tree and install tree.
-lang="pdl"
-if [ "$LD_LIBRARY_PATH" = "" ] ; then
-    export LD_LIBRARY_PATH=../src:@LIB_DIR@
-else
-    export LD_LIBRARY_PATH=../src:@LIB_DIR@:$LD_LIBRARY_PATH
-fi
-
-if [ "@HAVE_PDL_GRAPHICS_PLPLOT_40@" = "ON" ] ; then
-    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
-else
-  # Examples 02, 20, 21, 23, 24, 28, 29, and 30 require PDL::Graphics::PLplot
-  # version 0.46 or later.
-    INDEX_LIST="01 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 25 26 27"
-fi
-
-for index in $INDEX_LIST ; do
-    if [ "$verbose_test" ] ; then
-	echo "x${index}.pl"
-    fi
-    if [ "$index" = "14" ] ; then
-	echo ${OUTPUT_DIR}/x${index}a${lang}%n.$dsuffix | \
-	$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=$?
-    else
-	$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=$?
-    fi
-    cat test.error
-    if [ "$status_code" -ne 0 ] ; then
-	exit $status_code
-    fi
-  # Look for any PLPLOT ERROR messages from plwarn that do not result in an
-  # exit code.
-    is_error=`grep -l 'PLPLOT ERROR' test.error`
-    if [ -n "$is_error" ] ; then
-	exit 1
-    fi
-done


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