X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=351922eca89288fffc2575566b327960bff98269;hb=refs%2Fbuilds%2F20100307040504%2Fpspp;hp=6493a845643ce08525650aff6925a725a13355f7;hpb=2c81ed67896a7d3522c4ccdaf09e832491efd589;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 6493a84564..351922eca8 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)' -TESTS_ENVIRONMENT += PERL='@PERL@' PG_CONFIG='@PG_CONFIG@' +TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)' # Allow locale_charset to find charset.alias before running "make install". TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl' @@ -16,6 +16,7 @@ dist_TESTS = \ 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 \ @@ -108,10 +109,6 @@ dist_TESTS = \ 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 \ @@ -193,6 +190,8 @@ nodist_TESTS = \ tests/libpspp/range-set-test \ tests/libpspp/sparse-array-test \ tests/libpspp/str-test \ + tests/libpspp/string-map-test \ + tests/libpspp/string-set-test \ tests/libpspp/tower-test TESTS = $(dist_TESTS) $(nodist_TESTS) @@ -201,25 +200,19 @@ check_PROGRAMS += \ $(nodist_TESTS) \ tests/data/datasheet-test \ tests/formats/inexactify \ - tests/libpspp/sparse-xarray-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 = gl/libgl.la src/libpspp-core.la $(LIBINTL) tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) -# This seems to be necessary as the libtool artifacts aren't removed -# Automake bug ? -tests_data_datasheet_test_CLEAN: - $(RM) -r tests/data - -CLEAN_LOCAL += tests_data_datasheet_test_CLEAN - tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ src/libpspp/ll.h \ tests/libpspp/ll-test.c -tests_libpspp_ll_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_ll_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_llx_test_SOURCES = \ @@ -228,7 +221,7 @@ tests_libpspp_llx_test_SOURCES = \ src/libpspp/llx.c \ src/libpspp/llx.h \ tests/libpspp/llx-test.c -tests_libpspp_llx_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_heap_test_SOURCES = \ @@ -237,14 +230,14 @@ tests_libpspp_heap_test_SOURCES = \ src/libpspp/pool.c \ src/libpspp/pool.h \ tests/libpspp/heap-test.c -tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_hmap_test_SOURCES = \ src/libpspp/hmap.c \ src/libpspp/hmap.h \ tests/libpspp/hmap-test.c -tests_libpspp_hmap_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_hmapx_test_SOURCES = \ @@ -253,14 +246,14 @@ tests_libpspp_hmapx_test_SOURCES = \ src/libpspp/hmapx.c \ src/libpspp/hmapx.h \ tests/libpspp/hmapx-test.c -tests_libpspp_hmapx_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_abt_test_SOURCES = \ src/libpspp/abt.c \ src/libpspp/abt.h \ tests/libpspp/abt-test.c -tests_libpspp_abt_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_bt_test_SOURCES = \ @@ -276,7 +269,7 @@ tests_libpspp_range_map_test_SOURCES = \ src/libpspp/range-map.c \ src/libpspp/range-map.h \ tests/libpspp/range-map-test.c -tests_libpspp_range_map_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_range_map_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_range_set_test_SOURCES = \ @@ -287,12 +280,29 @@ tests_libpspp_range_set_test_SOURCES = \ src/libpspp/range-set.c \ src/libpspp/range-set.h \ tests/libpspp/range-set-test.c -tests_libpspp_range_set_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 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_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_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_tower_test_SOURCES = \ src/libpspp/abt.c \ @@ -302,7 +312,7 @@ tests_libpspp_tower_test_SOURCES = \ src/libpspp/tower.c \ src/libpspp/tower.h \ tests/libpspp/tower-test.c -tests_libpspp_tower_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_sparse_array_test_SOURCES = \ @@ -311,7 +321,7 @@ tests_libpspp_sparse_array_test_SOURCES = \ src/libpspp/pool.c \ src/libpspp/pool.h \ tests/libpspp/sparse-array-test.c -tests_libpspp_sparse_array_test_LDADD = gl/libgl.la @LIBINTL@ +tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_sparse_xarray_test_SOURCES = \ @@ -326,7 +336,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ src/libpspp/pool.c \ src/libpspp/tmpfile.c \ tests/libpspp/sparse-xarray-test.c -tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la @LIBINTL@ +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 @@ -336,7 +346,17 @@ tests_dissect_sysfile_SOURCES = \ src/libpspp/integer-format.c \ src/libpspp/float-format.c \ tests/dissect-sysfile.c -tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@ +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) \ @@ -345,9 +365,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 \ @@ -387,3 +404,44 @@ 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/testsuite.at \ + tests/language/stats/crosstabs.at \ + tests/output/render.at +TESTSUITE = $(srcdir)/tests/testsuite +DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE) + +CHECK_LOCAL += tests_check +tests_check: tests/atconfig tests/atlocal $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS) + +CLEAN_LOCAL += tests_clean +tests_clean: + test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean + +AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): package.m4 $(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'