X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fdata%2Fdata-in.at;h=a5285b0b6e35669f068b9ac06f25ea417f683601;hb=0625520a58e3cb811d699808e9df95593f7373a9;hp=95f93061b257c5ebb27fd064db7762bb55cfbe82;hpb=236d7040c7c5b2fe9f97dd4e2e59b06335c28e74;p=pspp

diff --git a/tests/data/data-in.at b/tests/data/data-in.at
index 95f93061b2..a5285b0b6e 100644
--- a/tests/data/data-in.at
+++ b/tests/data/data-in.at
@@ -1,16 +1,16 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation, either version 3 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
@@ -51,7 +51,7 @@ EOF
 m4_divert_pop([PREPARE_TESTS])
 
 AT_SETUP([numeric input formats])
-AT_KEYWORDS([data-in])
+AT_KEYWORDS([data-in slow])
 data_in_prng
 AT_CHECK([$PERL test-my-rand.pl])
 AT_DATA([num-in.pl],
@@ -247,7 +247,7 @@ title 'Test use of big numbers'.
 data list file='bignum.txt'/BIGNUM 1-40.
 list.
 
-*** Do the nonportable output for fun. 
+*** Do the nonportable output for fun.
 descriptives BIGNUM.
 ])
 AT_CHECK([pspp -o pspp.csv bignum.sps], [0], [ignore])
@@ -255,7 +255,8 @@ AT_CLEANUP
 
 AT_SETUP([DATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py date d-m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py date d-m-y])
 AT_FAIL_IF([test ! -s date.sps || test ! -s date.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv date.sps])
 AT_CHECK([cat date.output], [0], [expout])
@@ -263,7 +264,8 @@ AT_CLEANUP
 
 AT_SETUP([ADATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py adate m-d-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py adate m-d-y])
 AT_FAIL_IF([test ! -s adate.sps || test ! -s adate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv adate.sps])
 AT_CHECK([cat adate.output], [0], [expout])
@@ -271,7 +273,8 @@ AT_CLEANUP
 
 AT_SETUP([EDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py edate d-m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py edate d-m-y])
 AT_FAIL_IF([test ! -s edate.sps || test ! -s edate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv edate.sps])
 AT_CHECK([cat edate.output], [0], [expout])
@@ -279,7 +282,8 @@ AT_CLEANUP
 
 AT_SETUP([JDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py jdate j])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py jdate j])
 AT_FAIL_IF([test ! -s jdate.sps || test ! -s jdate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv jdate.sps])
 AT_CHECK([cat jdate.output], [0], [expout])
@@ -287,7 +291,8 @@ AT_CLEANUP
 
 AT_SETUP([SDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py sdate y-m-d])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py sdate y-m-d])
 AT_FAIL_IF([test ! -s sdate.sps || test ! -s sdate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv sdate.sps])
 AT_CHECK([cat sdate.output], [0], [expout])
@@ -295,7 +300,8 @@ AT_CLEANUP
 
 AT_SETUP([QYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py qyr qQy])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py qyr qQy])
 AT_FAIL_IF([test ! -s qyr.sps || test ! -s qyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv qyr.sps])
 AT_CHECK([cat qyr.output], [0], [expout])
@@ -303,7 +309,8 @@ AT_CLEANUP
 
 AT_SETUP([MOYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py moyr m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py moyr m-y])
 AT_FAIL_IF([test ! -s moyr.sps || test ! -s moyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv moyr.sps])
 AT_CHECK([cat moyr.output], [0], [expout])
@@ -311,24 +318,46 @@ AT_CLEANUP
 
 AT_SETUP([WKYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py wkyr wWy])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py wkyr wWy])
 AT_FAIL_IF([test ! -s wkyr.sps || test ! -s wkyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv wkyr.sps])
 AT_CHECK([cat wkyr.output], [0], [expout])
 AT_CLEANUP
 
 AT_SETUP([DATETIME input format])
-AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py datetime "d-m-y +H:M" "d-m-y +H:M:S"])
+AT_KEYWORDS([data-in slow])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py datetime "d-m-y +H:M" "d-m-y +H:M:S"])
 AT_FAIL_IF([test ! -s datetime.sps || test ! -s datetime.input || \
             test ! -s expout])
 AT_CHECK([pspp -O format=csv datetime.sps])
 AT_CHECK([cat datetime.output], [0], [expout])
 AT_CLEANUP
 
+AT_SETUP([YMDHMS input format])
+AT_KEYWORDS([data-in slow])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py ymdhms "y-m-d +H:M" "y-m-d +H:M:S"])
+AT_FAIL_IF([test ! -s ymdhms.sps || test ! -s ymdhms.input || \
+            test ! -s expout])
+AT_CHECK([pspp -O format=csv ymdhms.sps])
+AT_CHECK([cat ymdhms.output], [0], [expout])
+AT_CLEANUP
+
+AT_SETUP([MTIME input format])
+AT_KEYWORDS([data-in])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py mtime +M:S])
+AT_FAIL_IF([test ! -s mtime.sps || test ! -s mtime.input || test ! -s expout])
+AT_CHECK([pspp -O format=csv mtime.sps])
+AT_CHECK([cat mtime.output], [0], [expout])
+AT_CLEANUP
+
 AT_SETUP([TIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-time-input.py time +H:M +H:M:S])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py time +H:M +H:M:S])
 AT_FAIL_IF([test ! -s time.sps || test ! -s time.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv time.sps])
 AT_CHECK([cat time.output], [0], [expout])
@@ -336,13 +365,15 @@ AT_CLEANUP
 
 AT_SETUP([DTIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-time-input.py dtime  '+D H:M' '+D H:M:S'])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py dtime  '+D H:M' '+D H:M:S'])
 AT_FAIL_IF([test ! -s dtime.sps || test ! -s dtime.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv dtime.sps])
 AT_CHECK([cat dtime.output], [0], [expout])
 AT_CLEANUP
 
 AT_SETUP([binary and hexadecimal input (IB, PIB, and PIBHEX formats)])
+AT_KEYWORDS([slow])
 AT_CHECK([$PERL -e 'print pack "n", $_ foreach 0...65535' > binhex-in.data])
 AT_CHECK([[wc -c < binhex-in.data | sed 's/[ 	]//g']], [0], [131072
 ])
@@ -364,6 +395,7 @@ AT_CHECK([cat binhex-in.out], [0], [expout])
 AT_CLEANUP
 
 AT_SETUP([BCD input (P and PK formats)])
+AT_KEYWORDS([slow])
 AT_CHECK([$PERL -e 'print pack "n", $_ foreach 0...65535' > bcd-in.data])
 AT_CHECK([[wc -c < bcd-in.data | sed 's/[ 	]//g']], [0], [131072
 ])
@@ -384,6 +416,7 @@ AT_CHECK([cat bcd-in.out], [0], [expout])
 AT_CLEANUP
 
 AT_SETUP([legacy input (N and Z formats)])
+AT_KEYWORDS([slow])
 AT_CHECK([$PERL -e 'print pack "n", $_ foreach 0...65535' > legacy-in.data])
 AT_CHECK([[wc -c < legacy-in.data | sed 's/[ 	]//g']], [0], [131072
 ])