pivot table procedure conceptually works

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 1f3da3945071dc6e7a54231d7c2b879f0a9b83d3..661bfbb9a562024fedf804f069f8140cc45c566b 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -31,7 +31,9 @@ check_PROGRAMS += \
        tests/libpspp/tower-test \
        tests/libpspp/u8-istream-test \
        tests/libpspp/zip-test \
-       tests/output/render-test
+       tests/output/render-test \
+       tests/ui/syntax-gen-test
+
 
 check-programs: $(check_PROGRAMS)
 
@@ -214,6 +216,15 @@ tests_output_render_test_LDADD = \
        src/libpspp-core.la \
        $(CAIRO_LIBS)
 
+
+check_PROGRAMS += tests/ui/syntax-gen-test
+tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c
+tests_ui_syntax_gen_test_LDADD = \
+       src/ui/libuicommon.la \
+       src/libpspp-core.la \
+       $(CAIRO_LIBS)
+
+
 EXTRA_DIST += \
        tests/coverage.sh \
        tests/data/bcd-in.expected.cmp.gz \
@@ -226,12 +237,11 @@ EXTRA_DIST += \
        tests/data/num-out.expected.cmp.gz \
        tests/data/v13.sav \
        tests/data/v14.sav \
-        tests/language/data-io/Book1.gnm.unzipped \
-        tests/language/data-io/test.ods
+       tests/language/data-io/Book1.gnm.unzipped \
+       tests/language/data-io/test.ods \
+       tests/language/data-io/newone.ods
 
 CLEANFILES += *.save pspp.* foo*
-
-EXTRA_DIST += tests/OChangeLog
 \f
 # Autotest testsuite
 
@@ -250,6 +260,7 @@ TESTSUITE_AT = \
        tests/data/datasheet-test.at \
        tests/data/dictionary.at \
        tests/data/format-guesser.at \
+       tests/data/pc+-file-reader.at \
        tests/data/por-file.at \
        tests/data/sys-file-reader.at \
        tests/data/sys-file.at \
@@ -302,6 +313,7 @@ TESTSUITE_AT = \
        tests/language/stats/crosstabs.at \
        tests/language/stats/descriptives.at \
        tests/language/stats/examine.at \
+       tests/language/stats/graph.at \
        tests/language/stats/factor.at \
        tests/language/stats/flip.at \
        tests/language/stats/frequencies.at \
@@ -361,7 +373,9 @@ TESTSUITE_AT = \
        tests/output/output.at \
        tests/output/paper-size.at \
        tests/output/render.at \
+       tests/output/tables.at \
        tests/ui/terminal/main.at \
+       tests/ui/syntax-gen.at \
        tests/perl-module.at
 
 TESTSUITE = $(srcdir)/tests/testsuite
@@ -369,8 +383,8 @@ DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
-       cp $< $@
-       for t in $(TESTSUITE_AT); do \
+       $(AM_V_GEN)cp $< $@
+       $(AM_V_at)for t in $(TESTSUITE_AT); do \
          echo "m4_include([$$t])" >> $@ ;\
        done
 EXTRA_DIST += tests/testsuite.at
@@ -386,12 +400,12 @@ 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)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
-       mv $@.tmp $@
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
+       $(AM_V_at)mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
-       :;{ \
+       $(AM_V_GEN):;{ \
          echo '# Signature of the current package.' && \
          echo 'm4_define([AT_PACKAGE_NAME],      [$(PACKAGE_NAME)])' && \
          echo 'm4_define([AT_PACKAGE_TARNAME],   [$(PACKAGE_TARNAME)])' && \
@@ -430,14 +444,15 @@ valgrind_wrappers = \
        tests/valgrind/tower-test \
        tests/valgrind/u8-istream-test \
        tests/valgrind/render-test \
+       tests/valgrind/pspp-convert \
        tests/valgrind/pspp
 
 $(valgrind_wrappers): tests/valgrind-wrapper.in
        @$(MKDIR_P) tests/valgrind
-       sed -e 's,[@]wrap_program[@],$@,' \
+       $(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \
                $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
-       chmod +x $@.tmp
-       mv $@.tmp $@
+       $(AM_V_at)chmod +x $@.tmp
+       $(AM_V_at)mv $@.tmp $@
 CLEANFILES += $(valgrind_wrappers)
 EXTRA_DIST += tests/valgrind-wrapper.in