Initial version

[pspp] / tests / command / sysfiles.sh

diff --git a/tests/command/sysfiles.sh b/tests/command/sysfiles.sh
index e16d1612a41d10b81d3385fd04a0868e79907353..4dca4eaaf18437e760df74cf936ba13bc31d237c 100755 (executable)
--- a/tests/command/sysfiles.sh
+++ b/tests/command/sysfiles.sh
@@ -12,11 +12,13 @@ here=`pwd`;
 # ensure that top_srcdir is absolute
 cd $top_srcdir; 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
 }
 
@@ -77,17 +79,18 @@ $SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
-VARIABLE VARIAB_A VARIAB_B VARIAB_C
--------- -------- -------- --------
-    1.00     1.00     1.00     2.00 
-    1.00     1.00     2.00    30.00 
-    1.00     2.00     1.00     8.00 
-    1.00     2.00     2.00    20.00 
-    2.00     1.00     1.00     2.00 
-    2.00     1.00     2.00    22.00 
-    2.00     2.00     1.00     1.00 
-    2.00     2.00     2.00     3.00 
+perl -pi -e 's/^\s*\$//g' $TEMPDIR/pspp.list
+diff -b  -w $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+variable001 variable002 variable003 variable004
+----------- ----------- ----------- -----------
+       1.00        1.00        1.00        2.00  
+       1.00        1.00        2.00       30.00 
+       1.00        2.00        1.00       8.00 
+       1.00        2.00        2.00      20.00 
+       2.00        1.00        1.00       2.00 
+       2.00        1.00        2.00      22.00 
+       2.00        2.00        1.00       1.00 
+       2.00        2.00        2.00       3.00 
 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi