[Pspp-cvs] pspp/tests ChangeLog command/npar-binomial.sh c...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/04/04 04:25:48

Modified files:
        tests          : ChangeLog 
        tests/command  : npar-binomial.sh npar-chisquare.sh 
                         very-long-strings.sh 

Log message:
        * npar-binomial.sh: Be less picky about whitespace in PSPP output.
        
        * npar-chisquare.sh: Ditto.
        
        * very-long-strings.sh: Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/npar-binomial.sh?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/npar-chisquare.sh?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/very-long-strings.sh?cvsroot=pspp&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- ChangeLog   3 Apr 2007 22:55:07 -0000       1.83
+++ ChangeLog   4 Apr 2007 04:25:48 -0000       1.84
@@ -1,4 +1,13 @@
 2007-04-03  Ben Pfaff  <address@hidden>
+           John McCabe-Dansted <address@hidden>
+       
+       * npar-binomial.sh: Be less picky about whitespace in PSPP output.
+
+       * npar-chisquare.sh: Ditto.
+
+       * very-long-strings.sh: Ditto.
+
+2007-04-03  Ben Pfaff  <address@hidden>
 
        Apply patches #5828, #5837, #5841, #5843.
 

Index: command/npar-binomial.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/npar-binomial.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- command/npar-binomial.sh    7 Feb 2007 02:12:57 -0000       1.2
+++ command/npar-binomial.sh    4 Apr 2007 04:25:48 -0000       1.3
@@ -217,7 +217,7 @@
 
 activity="compare output 1"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.list - << EOF
 P < 0.5; N1/N2 < 1
 1.1 NPAR TESTS.  Binomial Test
 +-+------#--------+--+--------------+----------+---------------------+

Index: command/npar-chisquare.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/npar-chisquare.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- command/npar-chisquare.sh   7 Feb 2007 02:12:57 -0000       1.2
+++ command/npar-chisquare.sh   4 Apr 2007 04:25:48 -0000       1.3
@@ -96,7 +96,7 @@
 
 activity="compare output 1"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.list - << EOF
 1.1 NPAR TESTS.  x
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -197,7 +197,7 @@
 
 activity="compare errors 2"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/output
-diff  $TEMPDIR/output - << EOF
+diff -b  $TEMPDIR/output - << EOF
 error: CHISQUARE test specified 6 expected values, but 4 distinct values were 
encountered in variable y.
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
@@ -237,7 +237,7 @@
 
 activity="compare output 3"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 
+-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y            
       |
@@ -308,7 +308,7 @@
 
 activity="compare output 4"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 
+-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y            
       |

Index: command/very-long-strings.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/very-long-strings.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- command/very-long-strings.sh        7 Feb 2007 02:12:57 -0000       1.4
+++ command/very-long-strings.sh        4 Apr 2007 04:25:48 -0000       1.5
@@ -76,7 +76,7 @@
 
 activity="compare variable display 0"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
@@ -167,13 +167,13 @@
 # Check that the file read back in has the same data as what we wrote.
 
 activity="compare print"
-diff $TEMPDIR/out.txt $TEMPDIR/data
+diff -b $TEMPDIR/out.txt $TEMPDIR/data
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare variable display"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff $TEMPDIR/pspp.list - <<EOF
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 DISPLAY.  
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|