float-format: Convert tests to Autotest framework.

[pspp-builds.git] / tests / formats / format-guesser.sh

diff --git a/tests/formats/format-guesser.sh b/tests/formats/format-guesser.sh
index 37bd2bcc0a273d7696567f10f0b3571b15aa20f0..cf7bdb743254adfa135e27a93d99193f8cd33d12 100755 (executable)
--- a/tests/formats/format-guesser.sh
+++ b/tests/formats/format-guesser.sh
@@ -8,7 +8,7 @@ TEMPDIR=/tmp/pspp-tst-$$
 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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -19,9 +19,12 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
-     :
 }
 
 
@@ -94,6 +97,7 @@ sed -ne 's/#.*//;/^[  ]*$/!p' > $TEMPDIR/test-list <<'EOF'
 
 # Date and time formats.
 "01-OCT-1978" => DATE11
+"01-x-1978" => EDATE9          # Roman numeral for month.
 "01-13-99" => ADATE8
 "1-13-99" => ADATE7 (ADATE8)
 "13-01-99" => EDATE8
@@ -135,20 +139,10 @@ sed -ne 's/#.*//;/^[      ]*$/!p' > $TEMPDIR/test-list <<'EOF'
 "jan" => MONTH3
 "Feb" => MONTH3
 "MAR" => MONTH3
-"i" => MONTH1 (MONTH3)
-"ii" => MONTH2 (MONTH3)
-"iii" => MONTH3
-"iiii" => A4
-"iv" => MONTH2 (MONTH3)
-"v" => MONTH1 (MONTH3)
-"vi" => MONTH2 (MONTH3)
-"vii" => MONTH3
-"viii" => MONTH4
-"ix" => MONTH2 (MONTH3)
-"viiii" => A5
-"x" => MONTH1 (MONTH3)
-"xi" => MONTH2 (MONTH3)
-"xii" => MONTH3
+"i" => A1                      # Not detected as MONTH format.
+"v" => A1
+"ix" => A2
+"x" => A1
 "january" => MONTH7
 "janaury" => MONTH7
 "february" => MONTH8
@@ -192,7 +186,7 @@ activity="create syntax file"
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode \
+$SUPERVISOR $PSPP --testing-mode -o pspp.csv \
         $TEMPDIR/test.stat >$TEMPDIR/test.err 2> $TEMPDIR/test.out
 
 activity="compare output"