X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fno_case_size.sh;h=0c94051a1eb8e5e8098e42d5b50cee7b5938a483;hb=f1861ea4c715dfaddd84ff14be2ab92b13379014;hp=e21918343f6ca4c4d687df9e2dd2e76bce4948fc;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/command/no_case_size.sh b/tests/command/no_case_size.sh
index e2191834..0c94051a 100755
--- a/tests/command/no_case_size.sh
+++ b/tests/command/no_case_size.sh
@@ -11,6 +11,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
 top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -67,7 +68,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
@@ -77,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 3.67E+09    44.00 
-Africa                           30065000 7.78E+08    53.00 
-North America                    24256000 4.83E+08    23.00 
-South America                    17819000 3.42E+08    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 7.32E+08    46.00 
+Europe                            9938000 7.3E+008    46.00 
 Australia/Oceania                 7687000 31000000    14.00 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi