[Pspp-cvs] pspp src/libpspp/ChangeLog src/libpspp/float-fo...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/11/25 19:11:40

Modified files:
        src/libpspp    : ChangeLog float-format.c 
        tests          : ChangeLog 
        tests/bugs     : compression.sh 
        tests/command  : sysfile-info.sh 

Log message:
        * bugs/compression.sh: Don't fail on big-endian system.  Partial
        fix for bug #21590.
        
        * bugs/sysfile-info.sh: Disregard "Integer Format" and "Real
        Format" lines in SYSFILE INFO output, to permit big-endian systems
        to pass also.  Partial fix for bug #21590.
        
        * float-format.c (assemble_number): Only store 32 bits for Z short
        format.  Partial fix for bug #21590.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/ChangeLog?cvsroot=pspp&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/float-format.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/ChangeLog?cvsroot=pspp&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/bugs/compression.sh?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/sysfile-info.sh?cvsroot=pspp&r1=1.14&r2=1.15

Patches:
Index: src/libpspp/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- src/libpspp/ChangeLog       9 Nov 2007 03:06:29 -0000       1.84
+++ src/libpspp/ChangeLog       25 Nov 2007 19:11:39 -0000      1.85
@@ -1,3 +1,8 @@
+2007-11-25  Ben Pfaff  <address@hidden>
+
+       * float-format.c (assemble_number): Only store 32 bits for Z short
+       format.  Partial fix for bug #21590.
+
 2007-11-08  Ben Pfaff  <address@hidden>
 
        * str.c (ds_read_stream): Change return value semantics to be more

Index: src/libpspp/float-format.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/float-format.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/libpspp/float-format.c  12 Oct 2007 04:49:28 -0000      1.6
+++ src/libpspp/float-format.c  25 Nov 2007 19:11:40 -0000      1.7
@@ -695,7 +695,7 @@
       break;
 
     case FLOAT_Z_SHORT:
-      put_uint64 (native_to_be32 (assemble_z (fp, 7, 24)), number);
+      put_uint32 (native_to_be32 (assemble_z (fp, 7, 24)), number);
       break;
     case FLOAT_Z_LONG:
       put_uint64 (native_to_be64 (assemble_z (fp, 7, 56)), number);

Index: tests/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- tests/ChangeLog     15 Nov 2007 15:00:34 -0000      1.118
+++ tests/ChangeLog     25 Nov 2007 19:11:40 -0000      1.119
@@ -1,3 +1,12 @@
+2007-11-25  Ben Pfaff  <address@hidden>
+
+       * bugs/compression.sh: Don't fail on big-endian system.  Partial
+       fix for bug #21590.
+
+       * bugs/sysfile-info.sh: Disregard "Integer Format" and "Real
+       Format" lines in SYSFILE INFO output, to permit big-endian systems
+       to pass also.  Partial fix for bug #21590.
+
 2007-11-15  Ben Pfaff  <address@hidden>
 
        * automake.mk: Add definition of CHARSETALIASDIR to

Index: tests/bugs/compression.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/bugs/compression.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tests/bugs/compression.sh   10 Nov 2007 21:28:04 -0000      1.4
+++ tests/bugs/compression.sh   25 Nov 2007 19:11:40 -0000      1.5
@@ -77,15 +77,22 @@
 
 # Make sure the file really was compressed
 activity="inspect system file"
-dd if=$TEMPDIR/com.sav bs=1 skip=72 count=1 2> /dev/null | od > $TEMPDIR/file 
+dd if=$TEMPDIR/com.sav bs=1 skip=72 count=4 2> /dev/null | od > $TEMPDIR/file
 if [ $? -ne 0 ] ; then no_result ; fi
 
-activity="check compression byte"
-diff -b $TEMPDIR/file - <<EOF
-0000000 000001
-0000001
+activity="check compression setting"
+# Big-endian?
+diff -b $TEMPDIR/file - > /dev/null <<EOF
+0000000 000000 000001
+0000004
 EOF
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-pass;
+if [ $? -ne 0 ] ; then pass ; fi
+# Little-endian?
+diff -b $TEMPDIR/file - > /dev/null <<EOF
+0000000 000001 000000
+0000004
+EOF
+if [ $? -ne 0 ] ; then pass ; fi
+# Otherwise error.
+cat $TEMPDIR/file
+fail

Index: tests/command/sysfile-info.sh
===================================================================
RCS file: /cvsroot/pspp/pspp/tests/command/sysfile-info.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tests/command/sysfile-info.sh       26 Aug 2007 18:35:49 -0000      1.14
+++ tests/command/sysfile-info.sh       25 Nov 2007 19:11:40 -0000      1.15
@@ -78,7 +78,7 @@
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="filter output"
-egrep -v '^(Created|Endian): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
+egrep -v '^(Created|Endian|Integer Format|Real Format): ' $TEMPDIR/pspp.list > 
$TEMPDIR/out-filtered
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
@@ -94,8 +94,6 @@
 2.1 SYSFILE INFO.  
 File:           pro.sav
 Label:          No label.
-Integer Format: Little Endian.
-Real Format:    IEEE 754 LE.
 Variables:      2
 Cases:          3
 Type:           System File.