use struct design_matrix

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

diff --git a/tests/command/sort.sh b/tests/command/sort.sh
index c619ca25799bf4233d78518f304de9bdad8e7ccc..1eb4d855ae59560860cf5f0169d32a96bfe2271a 100755 (executable)
--- a/tests/command/sort.sh
+++ b/tests/command/sort.sh
@@ -5,10 +5,14 @@
 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
@@ -112,10 +116,11 @@ 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 -o raw-ascii sort.pspp
   if [ $? -ne 0 ] ; then no_result ; fi
- 
-  diff -B -w sort.exp sort.out
+  
+  perl -pi -e 's/^\s*$//g' sort.exp sort.out
+  diff -w sort.exp sort.out
   if [ $? -ne 0 ] ; then fail ; fi
 done
 echo