PLplot

Revision: 9178
          http://plplot.svn.sourceforge.net/plplot/?rev=9178&view=rev
Author:   airwin
Date:     2008-12-18 02:14:44 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
Fix shell scripting error (missing quotes around variable inside [].)

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2008-12-18 01:03:52 UTC (rev 9177)
+++ trunk/plplot_test/test_diff.sh.in	2008-12-18 02:14:44 UTC (rev 9178)
@@ -102,7 +102,7 @@
   echo "  Differing postscript output : ${different}"
   echo "  Missing stdout              : ${missingstdout}"
   echo "  Differing stdout            : ${diffstdout}"
-  if [ "${different}" != "" ]  || [ ${diffstdout} != "" ] ; then
+  if [ "${different}" != "" ]  || [ "${diffstdout}" != "" ] ; then
     ret=1
   fi
   fi 


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

Revision: 9219
          http://plplot.svn.sourceforge.net/plplot/?rev=9219&view=rev
Author:   airwin
Date:     2008-12-23 16:44:41 +0000 (Tue, 23 Dec 2008)

Log Message:
-----------
Add Ada "thick" examples to the ones that are tested.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2008-12-23 08:18:39 UTC (rev 9218)
+++ trunk/plplot_test/test_diff.sh.in	2008-12-23 16:44:41 UTC (rev 9219)
@@ -24,38 +24,52 @@
 
 # Compare C results with c++, f77, f95, java, octave, python, tcl, perl, 
 # ada and ocaml results
-for lang in c++ f77 f95 java octave python tcl perl ada ocaml ; do
+for lang in c++ f77 f95 java octave python tcl perl ada adathick ocaml ; do
 
   # Check which suffix is used for this binding
   case $lang in 
     c++)
+      xsuffix=
       suffix=cxx
       ;;
     f77)
+      xsuffix=
       suffix=f
       ;;
     f95)
+      xsuffix=
       suffix=f95
       ;;
     java)
+      xsuffix=
       suffix=j
       ;;
     octave)
+      xsuffix=
       suffix=o
       ;;
     python)
+      xsuffix=
       suffix=p
       ;;
     tcl)
+      xsuffix=
       suffix=t
       ;;
     perl)
+      xsuffix=
       suffix=pdl
       ;;
     ada)
+      xsuffix=
       suffix=a
       ;;
+    adathick)
+      xsuffix=
+      suffix=a
+      ;;
     ocaml)
+      xsuffix=
       suffix=ocaml
       ;;
   esac
@@ -67,27 +81,27 @@
 
   # Assume that if example 1 is missing then the language is
   # not implemented.
-  if [ -f x01${suffix}.psc ] ; then
+  if [ -f x${xsuffix}01${suffix}.psc ] ; then
     
   # Standard non-interactive examples
   # Skip example 14 because it requires two output files
   # Skip example 17 because it is interactive
   for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 \
       21 22 23 24 25 26 27 28 29 30 31 ; do
-    if [ ! -f x${index}c.psc ] ; then
+    if [ ! -f x${xsuffix}${index}c.psc ] ; then
       echo "C example ${index} is missing"
     else
-      if [ ! -f x${index}${suffix}.psc ] ; then
+      if [ ! -f x${xsuffix}${index}${suffix}.psc ] ; then
         missing="${missing} ${index}"
       else
-        @TAIL_EXECUTABLE@ --lines=+9 x${index}c.psc > test1.psc
-        @TAIL_EXECUTABLE@ --lines=+9 x${index}${suffix}.psc > test2.psc
+        @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}c.psc > test1.psc
+        @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}${suffix}.psc > test2.psc
         @DIFF_EXECUTABLE@ -q test1.psc test2.psc 2>&1 > /dev/null
         if [ $? != 0 ] ; then
           different="${different} ${index}"
         fi
-        if [ -f x${index}${suffix}_psc.txt ] ; then
-          @DIFF_EXECUTABLE@ -q x${index}c_psc.txt x${index}${suffix}_psc.txt 2>&1 > /dev/null
+        if [ -f x${xsuffix}${index}${suffix}_psc.txt ] ; then
+          @DIFF_EXECUTABLE@ -q x${xsuffix}${index}c_psc.txt x${xsuffix}${index}${suffix}_psc.txt 2>&1 > /dev/null
           if [ $? != 0 ] ; then
             diffstdout="${diffstdout} ${index}"
           fi


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

Revision: 9365
          http://plplot.svn.sourceforge.net/plplot/?rev=9365&view=rev
Author:   airwin
Date:     2009-01-21 22:04:14 +0000 (Wed, 21 Jan 2009)

Log Message:
-----------
Fix xsuffix logic bug so that results labelled adathick actually refer to
results from adathick comparisons rather than results from ada comparisons.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2009-01-21 08:19:19 UTC (rev 9364)
+++ trunk/plplot_test/test_diff.sh.in	2009-01-21 22:04:14 UTC (rev 9365)
@@ -21,6 +21,8 @@
 #
 
 ret=0
+# Comparison C results have no xsuffix.
+xsuffix_c=
 
 # Compare C results with c++, f77, f95, java, octave, python, tcl, perl, 
 # ada and ocaml results
@@ -65,7 +67,7 @@
 	    suffix=a
 	    ;;
 	adathick)
-	    xsuffix=
+	    xsuffix=thick
 	    suffix=a
 	    ;;
 	ocaml)
@@ -86,13 +88,13 @@
   # Standard non-interactive examples
 	for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 \
 	    21 22 23 24 25 26 27 28 29 30 31 ; do
-	    if [ ! -f x${xsuffix}${index}c.psc ] ; then
+	    if [ ! -f x${xsuffix_c}${index}c.psc ] ; then
 		echo "C example ${index} is missing"
 	    else
 		if [ ! -f x${xsuffix}${index}${suffix}.psc ] ; then
 		    missing="${missing} ${index}"
 		else
-		    @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}c.psc > test1.psc
+		    @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix_c}${index}c.psc > test1.psc
 		    @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}${suffix}.psc > test2.psc
 		    @DIFF_EXECUTABLE@ -q test1.psc test2.psc 2>&1 > /dev/null
 		    if [ $? != 0 ] ; then
@@ -100,7 +102,7 @@
 		    fi
 		    if [ "$index" != "14a" ] ; then
 			if [ -f x${xsuffix}${index}${suffix}_psc.txt ] ; then
-			    @DIFF_EXECUTABLE@ -q x${xsuffix}${index}c_psc.txt x${xsuffix}${index}${suffix}_psc.txt 2>&1 > /dev/null
+			    @DIFF_EXECUTABLE@ -q x${xsuffix_c}${index}c_psc.txt x${xsuffix}${index}${suffix}_psc.txt 2>&1 > /dev/null
 			    if [ $? != 0 ] ; then
 				diffstdout="${diffstdout} ${index}"
 			    fi


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

Revision: 9585
          http://plplot.svn.sourceforge.net/plplot/?rev=9585&view=rev
Author:   smekal
Date:     2009-02-23 14:39:52 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
tail on Mac OS X 10.5 (BSD like) doesn't know the --line option. Using -n option instead which should be known by GNU tail as well.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2009-02-23 09:56:40 UTC (rev 9584)
+++ trunk/plplot_test/test_diff.sh.in	2009-02-23 14:39:52 UTC (rev 9585)
@@ -98,8 +98,8 @@
 		if [ ! -f x${xsuffix}${index}${suffix}.psc ] ; then
 		    missing="${missing} ${index}"
 		else
-		    @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix_c}${index}c.psc > test1.psc
-		    @TAIL_EXECUTABLE@ --lines=+9 x${xsuffix}${index}${suffix}.psc > test2.psc
+		    @TAIL_EXECUTABLE@ -n +9 x${xsuffix_c}${index}c.psc > test1.psc
+		    @TAIL_EXECUTABLE@ -n +9 x${xsuffix}${index}${suffix}.psc > test2.psc
 		    @DIFF_EXECUTABLE@ -q test1.psc test2.psc 2>&1 > /dev/null
 		    if [ $? != 0 ] ; then
 			different="${different} ${index}"


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

Revision: 9876
          http://plplot.svn.sourceforge.net/plplot/?rev=9876&view=rev
Author:   airwin
Date:     2009-05-02 00:31:19 +0000 (Sat, 02 May 2009)

Log Message:
-----------
The check for the first example (to cut down on false reports for languages
that haven't had their example run or languages which are not enabled) is
now changed to a check for any examples (for languages like D where the
first example is not implemented yet).

N.B. because the release is soon, I haven't used the "break" command to
speed this up (in case win-bash doesn't have that command).  However, if
break does exist for win-bash, the break command in this script
should be uncommented.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2009-05-01 22:52:45 UTC (rev 9875)
+++ trunk/plplot_test/test_diff.sh.in	2009-05-02 00:31:19 UTC (rev 9876)
@@ -89,13 +89,19 @@
     diffstdout=""
     missingstdout=""
 
-  # Assume that if example 1 is missing then the language is
-  # not implemented.
-    if [ -f x${xsuffix}01${suffix}.psc ] ; then
-	
-  # Standard non-interactive examples
-	for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 \
-	    21 22 23 24 25 26 27 28 29 30 31 ; do
+    # List of standard examples
+    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
+    # Check if any examples exist for this language.
+    EXAMPLES_EXIST="no"
+    for index in ${INDEX_LIST} ; do
+	if [ -f x${xsuffix}${index}${suffix}.psc ] ; then
+	    EXAMPLES_EXIST="yes"
+	    # Commented out for release in case win-bash doesn't have this.
+	    # break
+	fi
+    done
+    if [ "$EXAMPLES_EXIST" = "yes" ] ; then
+	for index in ${INDEX_LIST} ; do
 	    if [ ! -f x${xsuffix_c}${index}c.psc ] ; then
 		echo "C example ${index} is missing"
 	    else


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

Revision: 9908
          http://plplot.svn.sourceforge.net/plplot/?rev=9908&view=rev
Author:   airwin
Date:     2009-05-05 02:01:25 +0000 (Tue, 05 May 2009)

Log Message:
-----------
Werner assures us win-bash has the "break" command to exit loops
so uncomment that.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2009-05-05 01:46:28 UTC (rev 9907)
+++ trunk/plplot_test/test_diff.sh.in	2009-05-05 02:01:25 UTC (rev 9908)
@@ -96,8 +96,7 @@
     for index in ${INDEX_LIST} ; do
 	if [ -f x${xsuffix}${index}${suffix}.psc ] ; then
 	    EXAMPLES_EXIST="yes"
-	    # Commented out for release in case win-bash doesn't have this.
-	    # break
+	    break
 	fi
     done
     if [ "$EXAMPLES_EXIST" = "yes" ] ; then


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

Revision: 10954
          http://plplot.svn.sourceforge.net/plplot/?rev=10954&view=rev
Author:   airwin
Date:     2010-04-30 02:09:50 +0000 (Fri, 30 Apr 2010)

Log Message:
-----------
Replace error return with warning message when some PostScript or stdout
results are different.  This allows the test_noninteractive target to
complete without any errors that confuse would-be testers.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2010-04-29 20:00:26 UTC (rev 10953)
+++ trunk/plplot_test/test_diff.sh.in	2010-04-30 02:09:50 UTC (rev 10954)
@@ -137,4 +137,6 @@
     fi 
 done
 
-exit ${ret}
+if [ "${ret}" != "0" ] ; then
+    echo "WARNING: Some PostScript or stdout results were different"
+fi


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

Revision: 11332
          http://plplot.svn.sourceforge.net/plplot/?rev=11332&view=rev
Author:   airwin
Date:     2010-11-15 10:11:39 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
Add 33rd example to difference testing.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2010-11-15 10:00:58 UTC (rev 11331)
+++ trunk/plplot_test/test_diff.sh.in	2010-11-15 10:11:39 UTC (rev 11332)
@@ -90,7 +90,7 @@
     missingstdout=""
 
     # List of standard examples
-    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
+    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 33"
     # Check if any examples exist for this language.
     EXAMPLES_EXIST="no"
     for index in ${INDEX_LIST} ; do


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

Revision: 12040
          http://plplot.svn.sourceforge.net/plplot/?rev=12040&view=rev
Author:   airwin
Date:     2011-11-24 21:17:46 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Add standard example 00 to the comparisons as a signal that this
(extremely simple) example should be propagated from C to all other
languages.

Modified Paths:
--------------
    trunk/plplot_test/test_diff.sh.in

Modified: trunk/plplot_test/test_diff.sh.in
===================================================================
--- trunk/plplot_test/test_diff.sh.in	2011-11-24 21:04:09 UTC (rev 12039)
+++ trunk/plplot_test/test_diff.sh.in	2011-11-24 21:17:46 UTC (rev 12040)
@@ -90,7 +90,7 @@
     missingstdout=""
 
     # List of standard examples
-    INDEX_LIST="01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 33"
+    INDEX_LIST="00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 14a 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 33"
     # Check if any examples exist for this language.
     EXAMPLES_EXIST="no"
     for index in ${INDEX_LIST} ; do

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