* command/no_case_size.sh: Update to match update DISPLAY and

SYSFILE INFO command output.

* command/rank.sh: Ditto.

* command/sysfile-info.sh: Ditto.

* command/very-long-strings.sh: Ditto.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1776bfadfc5d6666653e059bb86cdcc8bd705377..dc2c7f983c73744a0d518c9b08a4831dcdf511a5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,14 @@
+2007-08-12  Ben Pfaff  <blp@gnu.org>
+
+       * command/no_case_size.sh: Update to match update DISPLAY and
+       SYSFILE INFO command output.
+
+       * command/rank.sh: Ditto.
+
+       * command/sysfile-info.sh: Ditto.
+
+       * command/very-long-strings.sh: Ditto.
+
 2007-08-09  Ben Pfaff  <blp@gnu.org>
 
        Fix bug #18982.  Thanks to John Darrington for investigation,

diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh
index 738ea1404791fe22963f40f2e3fa92b6fb12d4af..e3fc2774d4b71b1fb25ca057b8ac54a958449f4d 100755 (executable)
--- a/tests/command/no_case_size.sh
+++ b/tests/command/no_case_size.sh
@@ -80,15 +80,27 @@ diff -b -w pspp.list - <<EOF
 #========#===========================================#========#
 |cont    |continents of the world                    |       1|
 |        |Format: A32                                |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |size    |sq km                                      |       2|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |pop     |population                                 |       3|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |count   |number of countries                        |       4|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
                             cont     size      pop    count
 -------------------------------- -------- -------- --------

diff --git a/tests/command/rank.sh b/tests/command/rank.sh
index d99c3092b17aa512fad32d11d471aeda95417a1d..bd0d5a2f4b84a4e28ef0a8639cfc9e434f2803ed 100755 (executable)
--- a/tests/command/rank.sh
+++ b/tests/command/rank.sh
@@ -389,26 +389,50 @@ b into Nb(N of b)
 |Variable|Description                                |Position|
 #========#===========================================#========#
 |a       |Format: F8.2                               |       1|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |b       |Format: F8.2                               |       2|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |count   |N of a                                     |       3|
 |        |Format: F6.0                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |Ra      |RANK of a                                  |       4|
 |        |Format: F9.3                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |Rb      |RANK of b                                  |       5|
 |        |Format: F9.3                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |RFR001  |RFRACTION of a                             |       6|
 |        |Format: F6.4                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |RFR002  |RFRACTION of b                             |       7|
 |        |Format: F6.4                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |Nb      |N of b                                     |       8|
 |        |Format: F6.0                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
        a        b  count        Ra        Rb RFR001 RFR002     Nb
 -------- -------- ------ --------- --------- ------ ------ ------
@@ -430,13 +454,25 @@ foo into RAN001(RANK of foo)
 |Variable|Description                                |Position|
 #========#===========================================#========#
 |foo     |Format: F8.2                               |       1|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |rfoo    |Format: F8.2                               |       2|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |ran003  |Format: F8.2                               |       3|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 |RAN001  |RANK of foo                                |       4|
 |        |Format: F9.3                               |        |
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
 Variables Created By RANK
 a into Sa(SAVAGE of a)

diff --git a/tests/command/sysfile-info.sh b/tests/command/sysfile-info.sh
index 38c61e15b30898e6a7c715a139525291ec784615..73e981e132f4d401534738b2d996b1da43b1c7e5 100755 (executable)
--- a/tests/command/sysfile-info.sh
+++ b/tests/command/sysfile-info.sh
@@ -107,8 +107,14 @@ Mode:           Compression on.
 |        |             |on |
 #========#=============#===#
 |x       |Format: F8.2 |  1|
+|        |Measure:     |   |
+|        |Display      |   |
+|        |Display      |   |
 +--------+-------------+---+
 |name    |Format: A10  |  2|
+|        |Measure:     |   |
+|        |Display      |   |
+|        |Display      |   |
 +--------+-------------+---+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi

diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index aae1c3da809cac824cb9c24b5ea5463e5d7ffe25..7489915e91ad41bb6f505d23db50dde9faac4464 100755 (executable)
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -82,12 +82,24 @@ diff -b $TEMPDIR/pspp.list - <<EOF
 |Variable|Description                                |Position|
 #========#===========================================#========#
 |N       |Format: F8.2                               |       1|
+|        |Measure: Scale                             |        |
+|        |Display Alignment: Right                   |        |
+|        |Display Width: 10                          |        |
 +--------+-------------------------------------------+--------+
 |A255    |Format: A255                               |       2|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
 |A258    |Format: A258                               |       3|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
 |A2000   |Format: A2000                              |       4|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
        N                                                                                                                                                                                                                                                            A255                                                                                                                                                                                                                                                               A258                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            A2000
 -------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -98,12 +110,24 @@ diff -b $TEMPDIR/pspp.list - <<EOF
 |Variable|Description                                |Position|
 #========#===========================================#========#
 |vl255   |Format: A255                               |       1|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 26                          |        |
 +--------+-------------------------------------------+--------+
 |vl256   |Format: A256                               |       2|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 26                          |        |
 +--------+-------------------------------------------+--------+
 |vl1335  |Format: A1335                              |       3|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 26                          |        |
 +--------+-------------------------------------------+--------+
 |vl2000  |Format: A2000                              |       4|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 26                          |        |
 +--------+-------------------------------------------+--------+
                                                                                                                                                                                                                                                           vl255                                                                                                                                                                                                                                                            vl256                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  vl1335                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           vl2000
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -178,12 +202,24 @@ EOF
 |Variable|Description                                |Position|
 #========#===========================================#========#
 |a       |Format: A10                                |       1|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 10                          |        |
 +--------+-------------------------------------------+--------+
 |b       |Format: A256                               |       2|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
 |c       |Format: A200                               |       3|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
 |d       |Format: A32767                             |       4|
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 32                          |        |
 +--------+-------------------------------------------+--------+
 EOF
     if [ $? -ne 0 ] ; then fail ; fi