X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=484ef0e11c67647e08b5bab59edf4dccdad667b1;hb=afdf3096926b561f4e6511c10fcf73fc6796b9d2;hp=2c335b56cc93a104a49943e58901ee27ee056aef;hpb=ffdd0bb0e46f9aa8c7bd8735a9f167f3580c9949;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 2c335b56..484ef0e1 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,52 +1,15 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='$(PERL)'
-
-# Allow locale_charset to find charset.alias before running "make install".
-TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
-
-TESTS_ENVIRONMENT += LC_ALL=C
-TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
-
-dist_TESTS = \
-	tests/formats/bcd-in.sh \
-	tests/formats/binhex-out.sh \
-	tests/formats/date-in.sh \
-	tests/formats/date-out.sh \
-	tests/formats/float-format.sh \
-	tests/formats/format-guesser.sh \
-	tests/formats/ib-in.sh \
-	tests/formats/legacy-in.sh \
-	tests/formats/month-in.sh \
-	tests/formats/month-out.sh \
-	tests/formats/num-in.sh \
-	tests/formats/num-out.sh \
-	tests/formats/time-in.sh \
-	tests/formats/time-out.sh \
-	tests/formats/wkday-in.sh \
-	tests/formats/wkday-out.sh \
-	tests/formats/360.sh \
-	tests/bugs/unwritable-dir.sh \
-	tests/bugs/val-labs.sh \
-	tests/bugs/val-labs-trailing-slash.sh \
-	tests/bugs/keep-all.sh \
-	tests/data/datasheet-test.sh \
-	tests/libpspp/sparse-xarray-test.sh \
-	tests/output/paper-size.sh \
-	tests/expressions/randist.sh \
-	tests/expressions/valuelabel.sh \
-	tests/expressions/variables.sh \
-	tests/expressions/vectors.sh
-
-TESTS = $(dist_TESTS) $(nodist_TESTS)
-
 check_PROGRAMS += \
-	$(nodist_TESTS) \
 	tests/data/datasheet-test \
-	tests/formats/inexactify \
+	tests/data/sack \
+	tests/data/inexactify \
+	tests/language/lexer/command-name-test \
+	tests/language/lexer/scan-test \
+	tests/language/lexer/segment-test \
 	tests/libpspp/abt-test \
 	tests/libpspp/bt-test \
+	tests/libpspp/encoding-guesser-test \
 	tests/libpspp/heap-test \
 	tests/libpspp/hmap-test \
 	tests/libpspp/hmapx-test \
@@ -63,13 +26,21 @@ check_PROGRAMS += \
 	tests/libpspp/string-set-test \
 	tests/libpspp/stringi-set-test \
 	tests/libpspp/tower-test \
+	tests/libpspp/u8-istream-test \
 	tests/output/render-test
 
+check-programs: $(check_PROGRAMS)
+
 tests_data_datasheet_test_SOURCES = \
 	tests/data/datasheet-test.c
 tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) 
 tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 
+tests_data_sack_SOURCES = \
+	tests/data/sack.c
+tests_data_sack_LDADD = src/libpspp-core.la $(LIBINTL) 
+tests_data_sack_CFLAGS = $(AM_CFLAGS)
+
 tests_libpspp_ll_test_SOURCES = \
 	src/libpspp/ll.c \
 	tests/libpspp/ll-test.c
@@ -83,6 +54,10 @@ tests_libpspp_llx_test_SOURCES = \
 tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
+tests_libpspp_encoding_guesser_test_SOURCES = \
+	tests/libpspp/encoding-guesser-test.c
+tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+
 tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.c \
 	src/libpspp/pool.c \
@@ -189,6 +164,9 @@ tests_libpspp_tower_test_SOURCES = \
 tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
+tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+
 tests_libpspp_sparse_array_test_SOURCES = \
 	src/libpspp/sparse-array.c \
 	src/libpspp/pool.c \
@@ -213,7 +191,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
 tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
-tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
+tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
 noinst_PROGRAMS += tests/dissect-sysfile
 tests_dissect_sysfile_SOURCES = \
@@ -223,6 +201,45 @@ tests_dissect_sysfile_SOURCES = \
 tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) 
 tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
+check_PROGRAMS += tests/language/lexer/command-name-test
+tests_language_lexer_command_name_test_SOURCES = \
+	src/data/identifier.c \
+	src/language/lexer/command-name.c \
+	tests/language/lexer/command-name-test.c
+tests_language_lexer_command_name_test_LDADD = \
+	src/libpspp/libpspp.la \
+	gl/libgl.la \
+	$(LIBINTL) 
+tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
+
+check_PROGRAMS += tests/language/lexer/scan-test
+tests_language_lexer_scan_test_SOURCES = \
+	src/data/identifier.c \
+	src/language/lexer/command-name.c \
+	src/language/lexer/scan.c \
+	src/language/lexer/segment.c \
+	src/language/lexer/token.c \
+	src/libpspp/pool.c \
+	src/libpspp/prompt.c \
+	src/libpspp/str.c \
+	src/libpspp/temp-file.c \
+	tests/language/lexer/scan-test.c
+tests_language_lexer_scan_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
+
+check_PROGRAMS += tests/language/lexer/segment-test
+tests_language_lexer_segment_test_SOURCES = \
+	src/data/identifier.c \
+	src/language/lexer/command-name.c \
+	src/language/lexer/segment.c \
+	src/libpspp/pool.c \
+	src/libpspp/prompt.c \
+	src/libpspp/str.c \
+	src/libpspp/temp-file.c \
+	tests/language/lexer/segment-test.c
+tests_language_lexer_segment_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
+
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
 tests_output_render_test_LDADD = \
@@ -233,48 +250,20 @@ tests_output_render_test_LDADD = \
 	$(LIBINTL)
 
 EXTRA_DIST += \
-	$(dist_TESTS) \
-	tests/coverage.sh tests/test_template \
-	tests/data/v13.sav tests/data/v14.sav \
-	tests/expressions/randist/beta.out \
-	tests/expressions/randist/cauchy.out \
-	tests/expressions/randist/chisq.out \
-	tests/expressions/randist/exp.out \
-	tests/expressions/randist/f.out \
-	tests/expressions/randist/gamma.out \
-	tests/expressions/randist/laplace.out \
-	tests/expressions/randist/lnormal.out \
-	tests/expressions/randist/logistic.out \
-	tests/expressions/randist/normal.out \
-	tests/expressions/randist/pareto.out \
-	tests/expressions/randist/compare.pl \
-	tests/expressions/randist/randist.pl \
-	tests/expressions/randist/randist.txt \
-	tests/expressions/randist/t.out \
-	tests/expressions/randist/uniform.out \
-	tests/expressions/randist/weibull.out \
-	tests/formats/bcd-in.expected.cmp.gz \
-	tests/formats/binhex-out.expected.gz \
-	tests/formats/ib-in.expected.cmp.gz \
-	tests/formats/legacy-in.expected.cmp.gz \
-	tests/formats/num-in.expected.gz \
-	tests/formats/num-out.expected.cmp.gz \
-	tests/formats/num-out-cmp.pl \
-	tests/formats/num-out-compare.pl \
-	tests/formats/num-out-decmp.pl \
-	tests/formats/num-out.pl \
+	tests/coverage.sh \
+	tests/data/bcd-in.expected.cmp.gz \
+	tests/data/binhex-in.expected.cmp.gz \
+	tests/data/binhex-out.expected.gz \
+	tests/data/legacy-in.expected.cmp.gz \
+	tests/data/num-in.expected.gz \
+	tests/data/num-out-cmp.pl \
+	tests/data/num-out.expected.cmp.gz \
+	tests/data/v13.sav \
+	tests/data/v14.sav \
         tests/language/data-io/Book1.gnm.unzipped
 
 CLEANFILES += *.save pspp.* foo*
 
-check-for-export-var-val:
-	@if grep -q 'export .*=' $(dist_TESTS) ; then \
-	 echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \
-	 false ; \
-	fi
-
-DIST_HOOKS += check-for-export-var-val
-
 EXTRA_DIST += tests/OChangeLog
 
 # Autotest testsuite
@@ -290,7 +279,11 @@ EXTRA_DIST += \
 TESTSUITE_AT = \
 	tests/data/calendar.at \
 	tests/data/data-in.at \
+	tests/data/data-out.at \
+	tests/data/datasheet-test.at \
+	tests/data/format-guesser.at \
 	tests/data/por-file.at \
+	tests/data/sys-file-reader.at \
 	tests/data/sys-file.at \
 	tests/language/command.at \
 	tests/language/control/do-if.at \
@@ -308,6 +301,7 @@ TESTSUITE_AT = \
 	tests/language/data-io/inpt-pgm.at \
 	tests/language/data-io/list.at \
 	tests/language/data-io/match-files.at \
+	tests/language/data-io/print-space.at \
 	tests/language/data-io/print.at \
 	tests/language/data-io/save.at \
 	tests/language/data-io/save-translate.at \
@@ -318,13 +312,17 @@ TESTSUITE_AT = \
 	tests/language/dictionary/rename-variables.at \
 	tests/language/dictionary/split-file.at \
 	tests/language/dictionary/sys-file-info.at \
+	tests/language/dictionary/value-labels.at \
 	tests/language/dictionary/variable-display.at \
 	tests/language/dictionary/vector.at \
 	tests/language/dictionary/weight.at \
 	tests/language/expressions/evaluate.at \
 	tests/language/expressions/parse.at \
+	tests/language/lexer/command-name.at \
 	tests/language/lexer/lexer.at \
 	tests/language/lexer/q2c.at \
+	tests/language/lexer/scan.at \
+	tests/language/lexer/segment.at \
 	tests/language/lexer/variable-parser.at \
 	tests/language/stats/aggregate.at \
 	tests/language/stats/autorecode.at \
@@ -343,6 +341,7 @@ TESTSUITE_AT = \
 	tests/language/stats/roc.at \
 	tests/language/stats/sort-cases.at \
 	tests/language/stats/t-test.at \
+	tests/language/utilities/cache.at \
 	tests/language/utilities/date.at \
 	tests/language/utilities/insert.at \
 	tests/language/utilities/permissions.at \
@@ -355,6 +354,8 @@ TESTSUITE_AT = \
 	tests/language/xforms/select-if.at \
 	tests/libpspp/abt.at \
 	tests/libpspp/bt.at \
+	tests/libpspp/encoding-guesser.at \
+	tests/libpspp/float-format.at \
 	tests/libpspp/heap.at \
 	tests/libpspp/hmap.at \
 	tests/libpspp/hmapx.at \
@@ -364,15 +365,20 @@ TESTSUITE_AT = \
 	tests/libpspp/range-map.at \
 	tests/libpspp/range-set.at \
 	tests/libpspp/sparse-array.at \
+	tests/libpspp/sparse-xarray-test.at \
 	tests/libpspp/str.at \
 	tests/libpspp/string-map.at \
 	tests/libpspp/stringi-map.at \
 	tests/libpspp/string-set.at \
 	tests/libpspp/stringi-set.at \
 	tests/libpspp/tower.at \
+	tests/libpspp/u8-istream.at \
 	tests/math/moments.at \
-	tests/output/render.at \
+	tests/math/randist.at \
 	tests/output/charts.at \
+	tests/output/output.at \
+	tests/output/paper-size.at \
+	tests/output/render.at \
 	tests/ui/terminal/main.at \
 	tests/perl-module.at
 
@@ -388,7 +394,7 @@ EXTRA_DIST += tests/testsuite.at
 
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean:
@@ -397,7 +403,7 @@ tests_clean:
 AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) 
-	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+	$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
 	mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.