X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fflip.sh;h=dc2b1770146cc7802cd0223f2ddcb20d4a251d23;hb=af6bce6320f2bd89d8ad24ee4162e7128ebd412b;hp=f4eb926fefd916dc47f4819a00efab8af8a11904;hpb=7e8eec6839205801adddbd6fafb2ceaf7c601d08;p=pspp-builds.git

diff --git a/tests/command/flip.sh b/tests/command/flip.sh
index f4eb926f..dc2b1770 100755
--- a/tests/command/flip.sh
+++ b/tests/command/flip.sh
@@ -5,14 +5,20 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
 
+LANG=C
+export LANG
 
 cleanup()
 {
@@ -50,7 +56,8 @@ cd $TEMPDIR
 
 activity="create flip.stat"
 cat > $TEMPDIR/flip.stat <<EOF
-data list /N 1 (a) A B C D 2-9.
+* Test FLIP with NEWNAME or, equivalently, with a variable named CASE_LBL.
+data list notable /N 1 (a) A B C D 2-9.
 list.
 begin data.
 v 1 2 3 4 5
@@ -63,28 +70,30 @@ flip newnames=n.
 list.
 flip.
 list.
+
+* Test FLIP without NEWNAME.
+data list list notable /v1 to v10.
+format all(f2).
+begin data.
+1 2 3 4 5 6 7 8 9 10
+4 5 6 7 8 9 10 11 12 13
+end data.
+
+list.
+
+flip.
+list. 
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/flip.stat
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/flip.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
-diff  -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
-1.1 DATA LIST.  Reading 1 record from the command file.
-+--------+------+-------+------+
-|Variable|Record|Columns|Format|
-#========#======#=======#======#
-|N       |     1|  1-  1|A1    |
-|A       |     1|  2-  3|F2.0  |
-|B       |     1|  4-  5|F2.0  |
-|C       |     1|  6-  7|F2.0  |
-|D       |     1|  8-  9|F2.0  |
-+--------+------+-------+------+
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b  $TEMPDIR/pspp.list - << EOF
 N  A  B  C  D
 - -- -- -- --
 v  1  2  3  4 
@@ -92,14 +101,12 @@ w  6  7  8  9
 x 11 12 13 14 
 y 16 17 18 19 
 z 21 22 23 24 
-
 CASE_LBL        V        W        X        Y        Z
 -------- -------- -------- -------- -------- --------
 A            1.00     6.00    11.00    16.00    21.00 
 B            2.00     7.00    12.00    17.00    22.00 
 C            3.00     8.00    13.00    18.00    23.00 
 D            4.00     9.00    14.00    19.00    24.00 
-
 CASE_LBL        A        B        C        D
 -------- -------- -------- -------- --------
 V            1.00     2.00     3.00     4.00 
@@ -107,6 +114,22 @@ W            6.00     7.00     8.00     9.00
 X           11.00    12.00    13.00    14.00 
 Y           16.00    17.00    18.00    19.00 
 Z           21.00    22.00    23.00    24.00 
+v1 v2 v3 v4 v5 v6 v7 v8 v9 v10
+-- -- -- -- -- -- -- -- -- ---
+ 1  2  3  4  5  6  7  8  9  10 
+ 4  5  6  7  8  9 10 11 12  13 
+CASE_LBL   VAR000   VAR001
+-------- -------- --------
+v1           1.00     4.00 
+v2           2.00     5.00 
+v3           3.00     6.00 
+v4           4.00     7.00 
+v5           5.00     8.00 
+v6           6.00     9.00 
+v7           7.00    10.00 
+v8           8.00    11.00 
+v9           9.00    12.00 
+v10         10.00    13.00 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi