Declare models in difinition of cmd_regression; free moment structure

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

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index da1f6b54246c407e3d03f561503e850693306af1..c3c96a35456b56d76db8bf76b9e6067cdf6e8867 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -4,11 +4,16 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
+: ${PERL:=perl}
 
-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
@@ -112,7 +117,7 @@ for count_repeat_buffers in \
   } > sort.pspp || no_result
   
   activity="run program"
-  $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii sort.pspp
+  $SUPERVISOR $PSPP --testing-mode sort.pspp
   if [ $? -ne 0 ] ; then no_result ; fi
   
   perl -pi -e 's/^\s*$//g' sort.exp sort.out