Checkin of new directory structure.

[pspp-builds.git] / tests / command / use.sh

diff --git a/tests/command/use.sh b/tests/command/use.sh
index 2afcc9390ab89c378b30e8f8732b0aef795d0b9a..4e217b1ff4396003eba71c8d94dd3cece169fb03 100755 (executable)
--- a/tests/command/use.sh
+++ b/tests/command/use.sh
@@ -3,17 +3,23 @@
 # This program tests USE, just to make sure that USE ALL is accepted silently.
 
 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
 }
 
@@ -47,7 +53,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TEMPDIR/filter.stat << EOF
-data list notable /x 1-2.
+data list notable /X 1-2.
 begin data.
 1
 2
@@ -68,12 +74,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat
+$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TEMPDIR/filter.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="check results"
-diff -B -b $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - << EOF
  X
 --
  1