CROSSTABS: Rewrite tests in Autotest and add test for bug #27883.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 96a2dae17bbe946e3b525c3091ce6c6eeca334e9..351922eca89288fffc2575566b327960bff98269 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -109,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 \
@@ -419,13 +415,14 @@ EXTRA_DIST += \
        $(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 $(TESTSUITEFLAGS)
+       $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean:
@@ -441,10 +438,10 @@ $(TESTSUITE): package.m4 $(TESTSUITE_AT)
 $(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@])'; \
+         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'