[Pspp-cvs] pspp/tests ChangeLog bugs/overwrite-input-file....

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/11/07 14:43:50

Modified files:
        tests          : ChangeLog 
        tests/bugs     : overwrite-input-file.sh 
                         overwrite-special-file.sh 

Log message:
        * bugs/overwrite-input-file.sh: Don't use non-portable "diff -B".
        
        * bugs/overwrite-special-file.sh: Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/overwrite-input-file.sh?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/overwrite-special-file.sh?cvsroot=pspp&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- ChangeLog   3 Nov 2007 22:02:20 -0000       1.114
+++ ChangeLog   7 Nov 2007 14:43:50 -0000       1.115
@@ -1,3 +1,11 @@
+2007-11-07  Ben Pfaff  <address@hidden>
+
+       * bugs/overwrite-input-file.sh: Don't use non-portable "diff -B".
+
+       * bugs/overwrite-special-file.sh: Ditto.
+
+       Reported by Jason Stover.
+
 2007-11-03  Ben Pfaff  <address@hidden>
 
        Allow output files to overwrite input files (bug #21280).

Index: bugs/overwrite-input-file.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/bugs/overwrite-input-file.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- bugs/overwrite-input-file.sh        3 Nov 2007 22:00:07 -0000       1.2
+++ bugs/overwrite-input-file.sh        7 Nov 2007 14:43:50 -0000       1.3
@@ -162,7 +162,8 @@
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b pspp.list - << EOF
        X        Y
 -------- --------
     1.00     2.00
@@ -170,7 +171,6 @@
     3.00     4.00
     4.00     5.00
     5.00     6.00
-
 X        Y
 - --------
 1     3.00
@@ -178,7 +178,6 @@
 3     5.00
 4     6.00
 5     7.00
-
 X        Y
 - --------
 1     4.00

Index: bugs/overwrite-special-file.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/bugs/overwrite-special-file.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bugs/overwrite-special-file.sh      3 Nov 2007 22:00:07 -0000       1.1
+++ bugs/overwrite-special-file.sh      7 Nov 2007 14:43:50 -0000       1.2
@@ -84,7 +84,8 @@
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="check that foo2.out was created"
-diff -b -B foo2.out - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b foo2.out - << EOF
  1
  2
  3