X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fimport-export.sh;h=342bc8b0452c126574e244913c459e63812b2d24;hb=f4b04e8323d4c95c3723ca47587742e7175ae75f;hp=41b8b13d78e6a8bde2b60a8a72ce7368866c50ef;hpb=7f3ac8559f71179a95fad28a30882ca476d8ac99;p=pspp

diff --git a/tests/command/import-export.sh b/tests/command/import-export.sh
index 41b8b13d78..342bc8b045 100755
--- a/tests/command/import-export.sh
+++ b/tests/command/import-export.sh
@@ -16,6 +16,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -49,7 +50,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /X * Y *.
+DATA LIST LIST NOTABLE /X Y.
 BEGIN DATA.
 1 2
 3 4
@@ -57,9 +58,6 @@ BEGIN DATA.
 END DATA.
 
 EXPORT /OUTFILE='wiz.por'.
-
-LIST.
-
 IMPORT /FILE='wiz.por'.
 
 LIST.
@@ -72,27 +70,13 @@ $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|X       |F8.0  |
-|Y       |F8.0  |
-+--------+------+
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
        X        Y
 -------- --------
     1.00     2.00 
     3.00     4.00 
     5.00     6.00 
-
-       X        Y
--------- --------
-    1.00     2.00 
-    3.00     4.00 
-    5.00     6.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi