X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fnpar-chisquare.sh;h=7ac52d03661691ffcffcc0947394e2d885216b44;hb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;hp=5e2e45cf2ef7015f2bf588f0172b431425c4088b;hpb=08e4a9535a7e1de9cc4b6e619e70805ab951b323;p=pspp-builds.git

diff --git a/tests/command/npar-chisquare.sh b/tests/command/npar-chisquare.sh
index 5e2e45cf..7ac52d03 100755
--- a/tests/command/npar-chisquare.sh
+++ b/tests/command/npar-chisquare.sh
@@ -91,11 +91,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output 1"
-diff $TEMPDIR/pspp.list - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
 1.1 NPAR TESTS.  x
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -108,7 +109,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    5.00#         1|      2.33|   -1.33|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 1.2 NPAR TESTS.  y
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -119,7 +119,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    4.00#         2|      3.50|   -1.50|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 1.3 NPAR TESTS.  Test Statistics
 +-----------#-----+-----+
 |           #  x  |  y  |
@@ -128,7 +127,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #    5|    3|
 |Asymp. Sig.# .678| .112|
 +-----------#-----+-----+
-
 2.1 NPAR TESTS.  y
 +--------#----------+----------+--------+
 |        #Observed N|Expected N|Residual|
@@ -139,7 +137,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |    4.00#         2|      3.50|   -1.50|
 |Total   #        14|          |        |
 +--------#----------+----------+--------+
-
 2.2 NPAR TESTS.  Test Statistics
 +-----------#------+
 |           #   y  |
@@ -148,7 +145,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #     3|
 |Asymp. Sig.#  .014|
 +-----------#------+
-
 3.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |
@@ -160,7 +156,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |3    #    4.00|         2|      1.58|     .42#    4.00|         2|      1.11|     .89|
 |Total#        |        10|          |        #        |         7|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 3.2 NPAR TESTS.  Test Statistics
 +-----------#----+-----+
 |           #  x |  y  |
@@ -169,7 +164,6 @@ diff $TEMPDIR/pspp.list - << EOF
 |df         #   2|    2|
 |Asymp. Sig.#.936| .127|
 +-----------#----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -198,11 +192,12 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 2"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE  > $TEMPDIR/output
+$SUPERVISOR $PSPP --testing-mode $TESTFILE  > $TEMPDIR/output
 if [ $? -eq 0 ] ; then no_result ; fi
 
 activity="compare errors 2"
-diff  $TEMPDIR/output - << EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/output
+diff -b  $TEMPDIR/output - << EOF
 error: CHISQUARE test specified 6 expected values, but 4 distinct values were encountered in variable y.
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
@@ -236,12 +231,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 3"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode $TESTFILE 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 3"
-diff $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |
@@ -258,7 +254,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |8    #    5.00|         1|      1.50|    -.50#    5.00|         1|      1.88|    -.88|
 |Total#        |        12|          |        #        |        15|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 1.2 NPAR TESTS.  Test Statistics
 +-----------#------+------+
 |           #   x  |   y  |
@@ -267,7 +262,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |df         #     7|     7|
 |Asymp. Sig.#  .015|  .002|
 +-----------#------+------+
-
 1.3 NPAR TESTS.  Descriptive Statistics
 +-#--+-----+-----+-----+-----+
 | # N| Mean| Std.|Minim|Maxim|
@@ -276,7 +270,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |x#12|2.467|1.193|1.000|5.000|
 |y#15|2.067|1.335|1.000|5.000|
 +-#--+-----+-----+-----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -309,12 +302,13 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 4"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE 
+$SUPERVISOR $PSPP --testing-mode $TESTFILE 
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 4"
-diff $TEMPDIR/pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
 1.1 NPAR TESTS.  Frequencies
 +-----#---------------------------------------#---------------------------------------+
 |     #                   x                   #                   y                   |
@@ -331,7 +325,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |8    #    5.00|         1|      1.75|    -.75#    5.00|         0|      1.75|   -1.75|
 |Total#        |        14|          |        #        |        14|          |        |
 +-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
 1.2 NPAR TESTS.  Test Statistics
 +-----------#------+------+
 |           #   x  |   y  |
@@ -340,7 +333,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |df         #     7|     7|
 |Asymp. Sig.#  .062|  .001|
 +-----------#------+------+
-
 1.3 NPAR TESTS.  Descriptive Statistics
 +-#--+-----+-----+-----+-----+
 | # N| Mean| Std.|Minim|Maxim|
@@ -349,7 +341,6 @@ diff $TEMPDIR/pspp.list - <<EOF
 |x#14|2.686|1.231|1.000|5.000|
 |y#14|1.857|1.099|1.000|4.000|
 +-#--+-----+-----+-----+-----+
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi