X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Frecode-copy-bug.sh;h=921be02c71784a869a4bedd27c0581a29d4e15d0;hb=db5df54124af56dc1dfce71f839d78da2b49e346;hp=0d9ed17124cc8219765bcd20f1ef7b86ba1bfaa2;hpb=4b1bad1b8eebc79d2e05ab4f023fc269d577473b;p=pspp

diff --git a/tests/bugs/recode-copy-bug.sh b/tests/bugs/recode-copy-bug.sh
index 0d9ed17124..921be02c71 100755
--- a/tests/bugs/recode-copy-bug.sh
+++ b/tests/bugs/recode-copy-bug.sh
@@ -3,17 +3,20 @@
 # This program tests ....
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 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
 }
 
@@ -56,23 +59,25 @@ cd $TEMPDIR
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="run program"
+activity="run program 1"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/recode-copy-bug-1.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
+activity="compare output 1"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-1.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 
-activity="run program"
+activity="run program 2"
 $SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/recode-copy-bug-2.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-activity="compare output"
-diff -b -B -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
+activity="compare output 2"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
+diff -b -w $TEMPDIR/pspp.list $top_srcdir/tests/bugs/recode-copy-bug-2.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 pass;