Merge commit 'origin/stable'

[pspp-builds.git] / tests / bugs / crosstabs-crash2.sh

diff --git a/tests/bugs/crosstabs-crash2.sh b/tests/bugs/crosstabs-crash2.sh
index 043aff878f498d955b699ecba9ca393a8b0cac0e..b0db128a1c54e01947a704fdacb7bb6f24d59d19 100755 (executable)
--- a/tests/bugs/crosstabs-crash2.sh
+++ b/tests/bugs/crosstabs-crash2.sh
@@ -22,6 +22,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -95,16 +99,18 @@ $TEMPDIR/crosstabs-crash2.sh.sps:6: warning: BEGIN DATA: Missing value(s) for al
 #---------------#--------+--------+--------+--------+--------+--------#
 #x * y          #       4|   66.7%|       2|   33.3%|       6|  100.0%#
 #===============#========#========#========#========#========#========#
-2.2 CROSSTABS.  x by y [count].
+2.2 CROSSTABS.  x * y [count].
 #===============#===================================#========#
 #               #                 y                 |        #
 #               #--------+--------+--------+--------+        #
-#              x#one unit|three lo|two dual|zero non|  Total #
+#              x#     one|   three|     two|    zero|  Total #
+#               #unity   |lots    |duality |none    |        #
+#               #        |        |        |        |        #
 #---------------#--------+--------+--------+--------+--------#
 #           1.00#     1.0|      .0|      .0|     1.0|     2.0#
 #           2.00#      .0|      .0|     1.0|      .0|     1.0#
 #           3.00#      .0|     1.0|      .0|      .0|     1.0#
-#Total          #    1.0%|    1.0%|    1.0%|    1.0%|    4.0%#
+#Total          #     1.0|     1.0|     1.0|     1.0|     4.0#
 #===============#========#========#========#========#========#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi