X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1s.sh;h=b0bb6ab4781695ee8f392eb6fd49ccce79f23407;hb=f8022db2c3c692c2c7c31c4c20743ef56e8066d4;hp=a24bb174ccbb74f81c96671b613057c3b459d24f;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp

diff --git a/tests/command/t-test-1s.sh b/tests/command/t-test-1s.sh
index a24bb174cc..b0bb6ab478 100755
--- a/tests/command/t-test-1s.sh
+++ b/tests/command/t-test-1s.sh
@@ -20,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -70,35 +74,25 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP -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
-1.1 DATA LIST.  Reading free-form data from INLINE.
-+--------+------+
-|Variable|Format|
-#========#======#
-|ID      |F8.0  |
-|ABC     |F8.0  |
-+--------+------+
-2.1 T-TEST.  One-Sample Statistics
-#===#=#====#==============#========#
-#   #N|Mean|Std. Deviation|SE. Mean#
-#===#=#====#==============#========#
-#ABC#6|3.00|           .84|    .342#
-#===#=#====#==============#========#
-2.2 T-TEST.  One-Sample Test
-#===#=====================================================#
-#   #                Test Value = 2.000000                #
-#   #-----+--+---------------+---------------+------------#
-#   #     |  |               |               |    95%     #
-#   #     |  |               |               +-----+------#
-#   #  t  |df|Sig. (2-tailed)|Mean Difference|Lower| Upper#
-#===#=====#==#===============#===============#=====#======#
-#ABC#2.928| 5|           .033|          1.000|.1220|1.8780#
-#===#=====#==#===============#===============#=====#======#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+ID,F8.0
+ABC,F8.0
+
+Table: One-Sample Statistics
+,N,Mean,Std. Deviation,S.E. Mean
+ABC,6,3.00,.84,.34
+
+Table: One-Sample Test
+,Test Value = 2.000000,,,,,
+,,,,,95% Confidence Interval of the Difference,
+,t,df,Sig. (2-tailed),Mean Difference,Lower,Upper
+ABC,2.93,5,.03,1.00,.12,1.88
 EOF
 if [ $? -ne 0 ] ; then fail ; fi