Initial version

[pspp] / tests / command / rename.sh

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index bb63003c7274cc689236cd9e5042afbe9e7b43ac..2c43d3a7f2c2a6463fb94f98fec174e4ad96fa51 100755 (executable)
--- a/tests/command/rename.sh
+++ b/tests/command/rename.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
 }
 
@@ -76,28 +78,29 @@ grep -i Brake $TEMPDIR/rename.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list - <<EOF | perl -e 's/^\s*$//g'
 1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|BRAKEFLU|F8.0  |
-|Y       |F8.0  |
-+--------+------+
-
-BRAKEFLU        Y
--------- --------
-    1.00     3.00 
-    2.00     3.00 
-    3.00     3.00 
-    4.00     3.00 
-
-APPLECAR        Y
--------- --------
-    1.00     3.00 
-    2.00     3.00 
-    3.00     3.00 
-    4.00     3.00 
++----------+------+
+| Variable |Format|
+#==========#======#
+|brakeFluid|F8.0  |
+|y         |F8.0  |
++----------+------+
+
+brakeFluid        y
+---------- --------
+      1.00     3.00 
+      2.00     3.00 
+      3.00     3.00 
+      4.00     3.00 
+
+applecarts        y
+---------- --------
+      1.00     3.00 
+      2.00     3.00 
+      3.00     3.00 
+      4.00     3.00 
 
 EOF
 if [ $? -ne 0 ] ; then fail ; fi