Checkin of new directory structure.

[pspp-builds.git] / tests / command / t-test-indep-missing-list.sh

diff --git a/tests/command/t-test-indep-missing-list.sh b/tests/command/t-test-indep-missing-list.sh
index 0a807cc2c81f740f862714745cfd334becbd2559..9cf7b0a2253fb9f5368b1fd445054cd29352ef38 100755 (executable)
--- a/tests/command/t-test-indep-missing-list.sh
+++ b/tests/command/t-test-indep-missing-list.sh
@@ -4,17 +4,23 @@
 # when LISTWISE missing values are involved
 
 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 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program 1"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2.
 begin data.
 1 1.0 3.5 6
@@ -64,7 +70,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="copy output"
@@ -72,7 +78,7 @@ cp $TEMPDIR/pspp.list $TEMPDIR/ref.list
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="create program 2"
-cat > $TEMPDIR/out.stat <<EOF
+cat > $TESTFILE <<EOF
 data list list /id * indep * dep1 * dep2 *.
 begin data.
 1 1.0 3.5 6
@@ -89,7 +95,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program 2"
-$here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi