X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Fprint.sh;h=a7e5b655210f45faeaab715e6450a1c1e25f1de4;hb=d87ef24cc012a5eb67bb98fad972d29f36f18f48;hp=1f135d9bb7ca6ebc2d0e546dd3f738c00e56219c;hpb=7e8eec6839205801adddbd6fafb2ceaf7c601d08;p=pspp-builds.git

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 1f135d9b..a7e5b655 100755
--- a/tests/command/print.sh
+++ b/tests/command/print.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()
 {
@@ -73,7 +79,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
+$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
 # Note   vv   --- there are errors in input.  Therefore, the  command must FAIL
 if [ $? -eq 0 ] ; then fail ; fi
 
@@ -98,9 +104,9 @@ if [ $? -ne 0 ] ; then fail ; 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 free-form data from file $TEMPDIR/data-list.data.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from "$TEMPDIR/data-list.data".
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -109,8 +115,7 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
-2.1 PRINT.  Writing 1 record(s) to file foo.
+2.1 PRINT.  Writing 1 record to "foo".
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -121,17 +126,12 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |     1| 19- 28|N10.0 |
 |"/"     |     1| 29- 29|A1    |
 +--------+------+-------+------+
-
-
        A        B        C        D
 -------- -------- -------- --------
      .       2.00     3.00     4.00 
-
      .       6.00     7.00     8.00 
-
      .      10.00    11.00    12.00 
-
-3.1 DATA LIST.  Reading free-form data from file $TEMPDIR/data-list.data.
+3.1 DATA LIST.  Reading free-form data from "$TEMPDIR/data-list.data".
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -140,8 +140,7 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |C       |F8.0  |
 |D       |F8.0  |
 +--------+------+
-
-4.1 PRINT.  Writing 1 record(s) to the listing file.
+4.1 PRINT.  Writing 1 record.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
@@ -151,7 +150,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
 |D       |     1| 28- 35|F8.2  |
 +--------+------+-------+------+
      .       2.00     3.00     4.00 
-
        A        B        C        D
 -------- -------- -------- --------
      .       2.00     3.00     4.00 
@@ -165,7 +163,6 @@ diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
    10.00    11.00      .        .   
    12.00      .        .        .   
    12.00      .        .        .   
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi