X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fn_of_cases.sh;h=667162d69993623a2b58f016d013cee95c35699b;hb=7c6e9646a94126a410fab4d00714396b98923230;hp=472a345734c7e4c1e3b44108d709e3ea49b6d112;hpb=04fb909bd65eee66428d131ff34a6e1fde42e243;p=pspp

diff --git a/tests/command/n_of_cases.sh b/tests/command/n_of_cases.sh
index 472a345734..667162d699 100755
--- a/tests/command/n_of_cases.sh
+++ b/tests/command/n_of_cases.sh
@@ -12,7 +12,7 @@ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
 
-PSPP=$top_builddir/src/ui/terminal/pspp
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -27,6 +27,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -75,30 +76,29 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - <<EOF
-       X
---------
-    1.00 
-    2.00 
-    3.00 
-    4.00 
-    5.00 
-    6.00 
-    7.00 
-    8.00 
-    9.00 
-   10.00 
-   11.00 
-   12.00 
-   13.00 
-   14.00 
-   15.00 
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Data List
+X
+1.00
+2.00
+3.00
+4.00
+5.00
+6.00
+7.00
+8.00
+9.00
+10.00
+11.00
+12.00
+13.00
+14.00
+15.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi