X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fexamine-percentiles.sh;h=3759710b2629bb684089d202a3288382b1937d55;hb=30728b09540b323fef43b23dd5f1e4d1e8298c92;hp=2428009ad65ed9bf43df1430aed1819d20a94109;hpb=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp-builds.git

diff --git a/tests/command/examine-percentiles.sh b/tests/command/examine-percentiles.sh
index 2428009a..3759710b 100755
--- a/tests/command/examine-percentiles.sh
+++ b/tests/command/examine-percentiles.sh
@@ -7,16 +7,22 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $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
 }
 
@@ -50,7 +56,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /x *.
+DATA LIST LIST /X *.
 BEGIN DATA.
 2.00 
 8.00 
@@ -75,19 +81,19 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare results"
-diff $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+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|
 #========#======#
 |X       |F8.0  |
 +--------+------+
-
 2.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -98,7 +104,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 2.2 EXAMINE.  Percentiles
 #================#================================#
 #                #             Percentiles        #
@@ -108,7 +113,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #X|HAverage      #.40|.80|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
 #=#==============#===#===#====#====#====#====#====#
-
 3.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -119,7 +123,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 3.2 EXAMINE.  Percentiles
 #==================#================================#
 #                  #             Percentiles        #
@@ -129,7 +132,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #X|Weighted Average#.30|.60|1.50|3.50|5.75|7.10|7.55#
 # |Tukey's Hinges  #   |   |3.50|5.00|6.50|    |    #
 #=#================#===#===#====#====#====#====#====#
-
 4.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -140,7 +142,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 4.2 EXAMINE.  Percentiles
 #================#================================#
 #                #             Percentiles        #
@@ -150,7 +151,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #X|Rounded       #.00|.00|2.00|5.00|5.00|8.00|8.00#
 # |Tukey's Hinges#   |   |3.50|5.00|6.50|    |    #
 #=#==============#===#===#====#====#====#====#====#
-
 5.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -161,7 +161,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 5.2 EXAMINE.  Percentiles
 #================#==================================#
 #                #              Percentiles         #
@@ -171,7 +170,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #X|Empirical     #2.00|2.00|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges#    |    |3.50|5.00|6.50|    |    #
 #=#==============#====#====#====#====#====#====#====#
-
 6.1 EXAMINE.  Case Processing Summary
 #=#=============================#
 # #            Cases            #
@@ -182,7 +180,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #=#=#=======#=#=======#=#=======#
 #X#3|   100%|0|     0%|3|   100%#
 #=#=#=======#=#=======#=#=======#
-
 6.2 EXAMINE.  Percentiles
 #==========================#==================================#
 #                          #              Percentiles         #
@@ -192,7 +189,6 @@ diff $TEMPDIR/pspp.list - << EOF
 #X|Empirical with averaging#2.00|2.00|2.00|5.00|8.00|8.00|8.00#
 # |Tukey's Hinges          #    |    |3.50|5.00|6.50|    |    #
 #=#========================#====#====#====#====#====#====#====#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi