X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fcount.sh;h=05ee4430314c5e5842cfdf3633c68db518ad8806;hb=c59b9819031877e1837b1294bb23671bfde9b433;hp=7e9d7818773a34f7114eadfee95e329149c3e213;hpb=c48bf64ab648b9b761a8e0774db3672d8009c64c;p=pspp

diff --git a/tests/command/count.sh b/tests/command/count.sh
index 7e9d781877..05ee443031 100755
--- a/tests/command/count.sh
+++ b/tests/command/count.sh
@@ -3,17 +3,23 @@
 # This program tests the count transformation
 
 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`
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -45,11 +51,11 @@ mkdir -p $TEMPDIR
 
 cd $TEMPDIR
 
-cat > $TEMPDIR/count.stat <<EOF
+cat > $TESTFILE <<EOF
 title 'Test COUNT transformation'.
 
 * we're going to count the 2s 4s and 1s in the data
-data list /v1 to v2 1-4(a).
+data list /V1 to V2 1-4(a).
 begin data.
 1234
 321      <----
@@ -59,26 +65,26 @@ begin data.
 03 4     <----
 0193
 end data.
-count c=v1 to v2('2',' 4','1').
+count C=v1 to v2('2',' 4','1').
 list.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/count.stat
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading 1 record from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST.  Reading 1 record from INLINE.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |V1      |     1|  1-  2|A2    |
 |V2      |     1|  3-  4|A2    |
 +--------+------+-------+------+
-
 V1 V2        C
 -- -- --------
 12 34      .00