X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ffile-label.sh;h=839990944250d67f133beb652dce4e3f9e2b92d7;hb=f62700038e9edd7d8002242015a900a15626bceb;hp=37a0cbd77708cbcaaf69b6ca30ee80846edd117d;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp

diff --git a/tests/command/file-label.sh b/tests/command/file-label.sh
index 37a0cbd777..8399909442 100755
--- a/tests/command/file-label.sh
+++ b/tests/command/file-label.sh
@@ -10,11 +10,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
 }
 
@@ -50,7 +52,7 @@ activity="create program"
 cat > $TESTFILE << EOF
 
 /* Set up a dummy active file in memory.
-data list /x 1 y 2.
+data list /X 1 Y 2.
 begin data.
 16
 27
@@ -114,7 +116,8 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff -b -B $TEMPDIR/pspp.filtered - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.filtered - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading 1 record from the command file.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|