Use default encoding when reading system files if no encoding is given in file.

[pspp-builds.git] / tests / command / no_case_size.sh

diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh
index 3d6f2867028a18ef8803ea0fa2bf8269adab2948..0c94051a1eb8e5e8098e42d5b50cee7b5938a483 100755 (executable)
--- a/tests/command/no_case_size.sh
+++ b/tests/command/no_case_size.sh
@@ -68,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
@@ -78,26 +78,38 @@ diff -b -w pspp.list - <<EOF
 +--------+-------------------------------------------+--------+
 |Variable|Description                                |Position|
 #========#===========================================#========#
-|CONT    |continents of the world                    |       1|
+|cont    |continents of the world                    |       1|
 |        |Format: A32                                |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
-|SIZE    |sq km                                      |       2|
+|size    |sq km                                      |       2|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
-|POP     |population                                 |       3|
+|pop     |population                                 |       3|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
-|COUNT   |number of countries                        |       4|
+|count   |number of countries                        |       4|
 |        |Format: F8.2                               |        |
+|        |Measure: Nominal                           |        |
+|        |Display Alignment: Left                    |        |
+|        |Display Width: 8                           |        |
 +--------+-------------------------------------------+--------+
-                            CONT     SIZE      POP    COUNT
+                            cont     size      pop    count
 -------------------------------- -------- -------- --------
-Asia                             44579000   4E+009    44.00 
-Africa                           30065000   8E+008    53.00 
-North America                    24256000   5E+008    23.00 
-South America                    17819000   3E+008    12.00 
+Asia                             44579000 3.7E+009    44.00 
+Africa                           30065000 7.8E+008    53.00 
+North America                    24256000 4.8E+008    23.00 
+South America                    17819000 3.4E+008    12.00 
 Antarctica                       13209000      .00      .00 
-Europe                            9938000   7E+008    46.00 
+Europe                            9938000 7.3E+008    46.00 
 Australia/Oceania                 7687000 31000000    14.00 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi