X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=a27e4d34cc8faba5d723b2271768e7c0ab110c0a;hb=c555358da9c0b1747b9b236ba28ec55efdc89852;hp=8a974a32f7033545d91cd075b8c879180a7c7eed;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 8a974a32f7..a27e4d34cc 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -7,17 +7,11 @@ TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)'
 TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
 
 TESTS_ENVIRONMENT += LC_ALL=C
+TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/command/add-files.sh \
-	tests/command/aggregate.sh \
-	tests/command/attributes.sh \
-	tests/command/autorecod.sh \
-	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
-	tests/command/count.sh \
 	tests/command/correlation.sh \
-	tests/command/data-list.sh \
 	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
 	tests/command/erase.sh \
@@ -27,7 +21,6 @@ dist_TESTS = \
 	tests/command/file-label.sh \
 	tests/command/file-handle.sh \
 	tests/command/filter.sh \
-	tests/command/flip.sh \
 	tests/command/get-data-txt.sh \
 	tests/command/get-data-txt-examples.sh \
 	tests/command/get-data-txt-importcases.sh \
@@ -46,9 +39,6 @@ dist_TESTS = \
 	tests/command/npar-chisquare.sh \
 	tests/command/npar-wilcoxon.sh \
 	tests/command/npar-sign.sh \
-	tests/command/oneway.sh \
-	tests/command/oneway-missing.sh \
-	tests/command/oneway-with-splits.sh \
 	tests/command/permissions.sh \
 	tests/command/print.sh \
 	tests/command/print-strings.sh \
@@ -100,22 +90,13 @@ dist_TESTS = \
 	tests/formats/wkday-in.sh \
 	tests/formats/wkday-out.sh \
 	tests/formats/360.sh \
-	tests/bugs/agg_crash.sh \
-	tests/bugs/agg-crash-2.sh \
-	tests/bugs/alpha-freq.sh \
 	tests/bugs/big-input.sh \
 	tests/bugs/big-input-2.sh \
 	tests/bugs/case-map.sh \
 	tests/bugs/comment-at-eof.sh \
-	tests/bugs/compute-fmt.sh \
 	tests/bugs/compression.sh \
-	tests/bugs/crosstabs.sh \
-	tests/bugs/crosstabs2.sh \
-	tests/bugs/crosstabs-crash.sh \
-	tests/bugs/crosstabs-crash2.sh \
 	tests/bugs/curtailed.sh \
 	tests/bugs/data-crash.sh \
-	tests/bugs/double-frequency.sh \
 	tests/bugs/empty-do-repeat.sh \
 	tests/bugs/get.sh \
 	tests/bugs/examine-crash.sh \
@@ -124,9 +105,7 @@ dist_TESTS = \
 	tests/bugs/examine-1sample.sh \
 	tests/bugs/examine-missing.sh \
 	tests/bugs/examine-missing2.sh \
-	tests/bugs/freq-nolabels.sh \
 	tests/bugs/get-no-file.sh \
-	tests/bugs/html-frequency.sh \
 	tests/bugs/if_crash.sh \
 	tests/bugs/input-crash.sh \
 	tests/bugs/lag_crash.sh \
@@ -135,7 +114,6 @@ dist_TESTS = \
 	tests/bugs/multipass.sh \
 	tests/bugs/overwrite-input-file.sh \
 	tests/bugs/overwrite-special-file.sh \
-	tests/bugs/piechart.sh \
 	tests/bugs/random.sh \
 	tests/bugs/shbang.sh \
 	tests/bugs/signals.sh \
@@ -149,26 +127,11 @@ dist_TESTS = \
 	tests/bugs/unwritable-dir.sh \
 	tests/bugs/val-labs.sh \
 	tests/bugs/val-labs-trailing-slash.sh \
-	tests/bugs/recode-copy-bug.sh \
-	tests/bugs/computebug.sh \
-	tests/bugs/compute-lv.sh \
-	tests/bugs/compute-sum.sh \
-	tests/bugs/temp-freq.sh \
 	tests/bugs/print-crash.sh \
 	tests/bugs/keep-all.sh \
 	tests/data/datasheet-test.sh \
 	tests/libpspp/sparse-xarray-test.sh \
 	tests/output/paper-size.sh \
-	tests/xforms/recode.sh \
-	tests/stats/descript-basic.sh \
-	tests/stats/descript-missing.sh \
-	tests/stats/descript-mean-bug.sh \
-	tests/stats/moments.sh \
-	tests/stats/percentiles-compatible.sh \
-	tests/stats/ntiles.sh \
-	tests/stats/percentiles-enhanced.sh \
-	tests/expressions/expressions.sh \
-	tests/expressions/epoch.sh \
 	tests/expressions/randist.sh \
 	tests/expressions/valuelabel.sh \
 	tests/expressions/variables.sh \
@@ -194,6 +157,10 @@ nodist_TESTS = \
 	tests/libpspp/range-set-test \
 	tests/libpspp/sparse-array-test \
 	tests/libpspp/str-test \
+	tests/libpspp/string-map-test \
+	tests/libpspp/stringi-map-test \
+	tests/libpspp/string-set-test \
+	tests/libpspp/stringi-set-test \
 	tests/libpspp/tower-test
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -202,11 +169,13 @@ check_PROGRAMS += \
 	$(nodist_TESTS) \
 	tests/data/datasheet-test \
 	tests/formats/inexactify \
-	tests/libpspp/sparse-xarray-test
+	tests/libpspp/i18n-test \
+	tests/libpspp/sparse-xarray-test \
+	tests/output/render-test
 
 tests_data_datasheet_test_SOURCES = \
 	tests/data/datasheet-test.c
-tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la $(LIBINTL) 
+tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) 
 tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_ll_test_SOURCES = \
@@ -230,6 +199,7 @@ tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
+	src/libpspp/temp-file.c \
 	tests/libpspp/heap-test.c
 tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -250,6 +220,9 @@ tests_libpspp_hmapx_test_SOURCES = \
 tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
+tests_libpspp_i18n_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) 
+
 tests_libpspp_abt_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
@@ -280,6 +253,7 @@ tests_libpspp_range_set_test_SOURCES = \
 	src/libpspp/pool.h \
 	src/libpspp/range-set.c \
 	src/libpspp/range-set.h \
+	src/libpspp/temp-file.c \
 	tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -288,11 +262,53 @@ tests_libpspp_str_test_SOURCES = \
 	tests/libpspp/str-test.c
 tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) 
 
+tests_libpspp_string_map_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/string-map.c \
+	src/libpspp/string-set.c \
+	tests/libpspp/string-map-test.c
+tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_stringi_map_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/pool.c \
+	src/libpspp/str.c \
+	src/libpspp/stringi-map.c \
+	src/libpspp/string-set.c \
+	src/libpspp/stringi-set.c \
+	src/libpspp/temp-file.c \
+	tests/libpspp/stringi-map-test.c
+tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_string_set_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/string-set.c \
+	tests/libpspp/string-set-test.c
+tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
+tests_libpspp_stringi_set_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/pool.c \
+	src/libpspp/str.c \
+	src/libpspp/stringi-set.c \
+	src/libpspp/temp-file.c \
+	tests/libpspp/stringi-set-test.c
+tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
+	src/libpspp/temp-file.c \
 	src/libpspp/tower.c \
 	src/libpspp/tower.h \
 	tests/libpspp/tower-test.c
@@ -304,7 +320,8 @@ tests_libpspp_sparse_array_test_SOURCES = \
 	src/libpspp/sparse-array.h \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
-	tests/libpspp/sparse-array-test.c
+	tests/libpspp/sparse-array-test.c \
+	src/libpspp/temp-file.c
 tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
@@ -312,13 +329,14 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
 	src/libpspp/argv-parser.c \
 	src/libpspp/bt.c \
 	src/libpspp/deque.c \
+	src/libpspp/ext-array.c \
 	src/libpspp/model-checker.c \
 	src/libpspp/range-set.c \
 	src/libpspp/sparse-array.c \
 	src/libpspp/sparse-xarray.c \
 	src/libpspp/str.c \
 	src/libpspp/pool.c \
-	src/libpspp/tmpfile.c \
+	src/libpspp/temp-file.c \
 	tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -333,6 +351,15 @@ tests_dissect_sysfile_SOURCES = \
 tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) 
 tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
+check_PROGRAMS += tests/output/render-test
+tests_output_render_test_SOURCES = tests/output/render-test.c
+tests_output_render_test_LDADD = \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	$(CAIRO_LIBS) \
+	$(LIBICONV) \
+	$(LIBINTL)
+
 EXTRA_DIST += \
 	$(dist_TESTS) \
         tests/Book1.gnm.unzipped \
@@ -340,9 +367,6 @@ EXTRA_DIST += \
 	tests/no_case_size.sav \
 	tests/coverage.sh tests/test_template \
 	tests/v13.sav tests/v14.sav \
-	tests/bugs/computebug.stat tests/bugs/computebug.out \
-	tests/bugs/recode-copy-bug-1.stat tests/bugs/recode-copy-bug-2.stat \
-	tests/bugs/recode-copy-bug-1.out tests/bugs/recode-copy-bug-2.out \
 	tests/expressions/randist/beta.out \
 	tests/expressions/randist/cauchy.out \
 	tests/expressions/randist/chisq.out \
@@ -382,3 +406,76 @@ check-for-export-var-val:
 DIST_HOOKS += check-for-export-var-val
 
 EXTRA_DIST += tests/OChangeLog
+
+# Autotest testsuite
+
+EXTRA_DIST += \
+	$(TESTSUITE_AT) \
+	$(TESTSUITE) \
+	tests/atlocal.in \
+	$(srcdir)/package.m4 \
+	$(TESTSUITE)
+
+TESTSUITE_AT = \
+	tests/data/calendar.at \
+	tests/language/data-io/add-files.at \
+	tests/language/data-io/data-list.at \
+	tests/language/data-io/data-reader.at \
+	tests/language/data-io/save.at \
+	tests/language/data-io/save-translate.at \
+	tests/language/dictionary/attributes.at \
+	tests/language/dictionary/mrsets.at \
+	tests/language/expressions/evaluate.at \
+	tests/language/stats/aggregate.at \
+	tests/language/stats/autorecode.at \
+	tests/language/stats/crosstabs.at \
+	tests/language/stats/descriptives.at \
+	tests/language/stats/factor.at \
+	tests/language/stats/flip.at \
+	tests/language/stats/frequencies.at \
+	tests/language/stats/oneway.at \
+	tests/language/utilities/set.at \
+	tests/language/xforms/compute.at \
+	tests/language/xforms/count.at \
+	tests/language/xforms/recode.at \
+	tests/libpspp/i18n.at \
+	tests/math/moments.at \
+	tests/output/render.at \
+	tests/output/charts.at \
+	tests/perl-module.at
+
+TESTSUITE = $(srcdir)/tests/testsuite
+DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
+
+$(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile
+	cp $< $@
+	for t in $(TESTSUITE_AT); do \
+	  echo "m4_include([$$t])" >> $@ ;\
+	done
+
+
+CHECK_LOCAL += tests_check
+tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
+
+CLEAN_LOCAL += tests_clean
+tests_clean:
+	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C 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
+	mv $@.tmp $@
+
+# The `:;' works around a Bash 3.2 bug when the output is not writeable.
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+	:;{ \
+	  echo '# Signature of the current package.' && \
+	  echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
+	  echo 'm4_define([AT_PACKAGE_VERSION],   [$(PACKAGE_VERSION)])' && \
+	  echo 'm4_define([AT_PACKAGE_STRING],    [$(PACKAGE_STRING)])' && \
+	  echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \
+	  echo 'm4_define([AT_PACKAGE_URL],       [$(PACKAGE_URL)])'; \
+	} >'$(srcdir)/package.m4'