X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Frank.sh;h=d98c8e2211c67b0316334b2973f84ed9e726f00f;hb=f7d7808a7a0aa4301da16074482ba9547ceff2c8;hp=d99c3092b17aa512fad32d11d471aeda95417a1d;hpb=5060bf698ceb6a0eedcc963a1c5fee220b7be478;p=pspp-builds.git

diff --git a/tests/command/rank.sh b/tests/command/rank.sh
index d99c3092..d98c8e22 100755
--- a/tests/command/rank.sh
+++ b/tests/command/rank.sh
@@ -26,6 +26,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -81,7 +82,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 # Check that it properly handles failed transformations.
 activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/err $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/err $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi
 
 activity="diff 1"
@@ -130,7 +131,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program (syntax errors)"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e $TEMPDIR/errs $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/errs $TESTFILE 
 if [ $? -ne 1 ] ; then fail ; fi
 
 activity="compare errors"
@@ -358,7 +359,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 3"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
@@ -389,26 +390,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 +455,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)
@@ -544,13 +581,20 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 4"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE 
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output 4"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - << EOF
+$TEMPDIR/rank.sh.sps:3: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:4: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:5: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:6: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:7: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:8: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
+$TEMPDIR/rank.sh.sps:9: warning: BEGIN DATA: Missing value(s) for all variables from rx onward.  These will be filled with the system-missing value or blanks, as appropriate.
 Variables Created By RANK
 x into RNKRA01(RANK of x)
        x       rx   RNKRA01