NUMERIC, STRING, LEAVE: Improve error messages.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index f9bea8fa51cca393a6141ccccd1e043d15d73bd3..6cfb3e0eee07bce3965425f318d4aecfe09aeab2 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -376,12 +376,14 @@ TESTSUITE_AT = \
        tests/language/dictionary/apply.at \
        tests/language/dictionary/delete-variables.at \
        tests/language/dictionary/formats.at \
+       tests/language/dictionary/leave.at \
        tests/language/dictionary/missing-values.at \
        tests/language/dictionary/mrsets.at \
-       tests/language/dictionary/modify-variables.at \
+       tests/language/dictionary/numeric.at \
        tests/language/dictionary/rename-variables.at \
        tests/language/dictionary/sort-variables.at \
        tests/language/dictionary/split-file.at \
+       tests/language/dictionary/string.at \
        tests/language/dictionary/sys-file-info.at \
        tests/language/dictionary/value-labels.at \
        tests/language/dictionary/variable-display.at \
@@ -398,6 +400,7 @@ TESTSUITE_AT = \
        tests/language/stats/autorecode.at \
        tests/language/stats/correlations.at \
        tests/language/stats/crosstabs.at \
+       tests/language/stats/ctables.at \
        tests/language/stats/descriptives.at \
        tests/language/stats/examine.at \
        tests/language/stats/graph.at \
@@ -487,8 +490,16 @@ $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
 
 EXTRA_DIST += tests/testsuite.at
 
+# Generate a TableLook that prints all layers of pivot tables.
+check_DATA = tests/all-layers.stt
+tests/all-layers.stt: utilities/pspp-output
+       $(AM_V_GEN)$< get-table-look - $@.tmp
+       $(AM_V_at)if grep 'printAllLayers="false"' $@.tmp >/dev/null; then :; else \
+               echo >&2 "$<: expected printAllLayers=\"false\""; exit 1; fi
+       $(AM_v_at)sed 's/printAllLayers="false"/printAllLayers="true"/' < $@.tmp > $@
+
 CHECK_LOCAL += tests_check
-tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS)
+tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) $(check_DATA)
        XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) RUNNER='$(RUNNER)' $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean