X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=7b5f9286be42608f4ebf66d11c56743123f3ff72;hb=68822d68b12db1175aa3749997a48d1d84212540;hp=cb70fd3e8ec2f5ad645fde7b7a04dbb3e461a942;hpb=d20bfac12a54c3593c3762afa5341a0bf1049d1e;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index cb70fd3e8e..7b5f9286be 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -236,9 +236,18 @@ tests_math_chart_get_ticks_format_test_LDADD = \
 	src/libpspp-core.la \
 	gl/libgl.la
 
-check_PROGRAMS += tests/output/render-test
-tests_output_render_test_SOURCES = tests/output/render-test.c
-tests_output_render_test_LDADD = \
+check_PROGRAMS += tests/output/pivot-table-test
+tests_output_pivot_table_test_SOURCES = tests/output/pivot-table-test.c
+tests_output_pivot_table_test_LDADD = \
+	src/libpspp.la \
+	src/libpspp-core.la \
+	gl/libgl.la \
+	$(CAIRO_LIBS)
+EXTRA_DIST += tests/output/look.stt
+
+check_PROGRAMS += tests/output/ascii-test
+tests_output_ascii_test_SOURCES = tests/output/ascii-test.c
+tests_output_ascii_test_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(CAIRO_LIBS)
@@ -253,18 +262,19 @@ tests_ui_syntax_gen_test_LDADD = \
 check_PROGRAMS += tests/output/tex-glyphs
 tests_output_tex_glyphs_SOURCES = \
 	tests/output/tex-glyphs.c
-tests_output_tex_glyphs_LDADD = src/libpspp-core.la src/output/liboutput.la
+tests_output_tex_glyphs_LDADD = src/output/liboutput.la src/libpspp-core.la
 tests_output_tex_glyphs_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output
 
 check_PROGRAMS += tests/output/tex-strings
 tests_output_tex_strings_SOURCES = \
 	tests/output/tex-strings.c
-tests_output_tex_strings_LDADD = src/libpspp-core.la src/output/liboutput.la
+tests_output_tex_strings_LDADD = src/output/liboutput.la src/libpspp-core.la
 tests_output_tex_strings_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output
 
 
 EXTRA_DIST += \
 	tests/coverage.sh \
+	tests/data/repeating-2.ods \
 	tests/data/simple.ods \
 	tests/data/simple.gnumeric \
 	tests/data/sparse.ods \
@@ -285,7 +295,6 @@ EXTRA_DIST += \
 	tests/data/hotel-encrypted.sav \
 	tests/data/legacy-in.expected.cmp.gz \
 	tests/data/num-in.expected.gz \
-	tests/data/num-out-cmp.pl \
 	tests/data/num-out.expected.cmp.gz \
 	tests/data/test-date-input.py \
 	tests/data/test-time-input.py \
@@ -330,6 +339,7 @@ TESTSUITE_AT = \
 	tests/data/sys-file.at \
 	tests/data/encrypted-file.at \
 	tests/language/command.at \
+	tests/language/control/define.at \
 	tests/language/control/do-if.at \
 	tests/language/control/do-repeat.at \
 	tests/language/control/loop.at \
@@ -347,6 +357,8 @@ TESTSUITE_AT = \
 	tests/language/data-io/list.at \
 	tests/language/data-io/match-files.at \
 	tests/language/data-io/matrix-data.at \
+	tests/language/data-io/matrix-reader.at \
+	tests/language/data-io/mconvert.at \
 	tests/language/data-io/print-space.at \
 	tests/language/data-io/print.at \
 	tests/language/data-io/save.at \
@@ -371,7 +383,6 @@ TESTSUITE_AT = \
 	tests/language/expressions/parse.at \
 	tests/language/lexer/command-name.at \
 	tests/language/lexer/lexer.at \
-	tests/language/lexer/q2c.at \
 	tests/language/lexer/scan.at \
 	tests/language/lexer/segment.at \
 	tests/language/lexer/variable-parser.at \
@@ -387,6 +398,7 @@ TESTSUITE_AT = \
 	tests/language/stats/frequencies.at \
 	tests/language/stats/glm.at \
 	tests/language/stats/logistic.at \
+	tests/language/stats/matrix.at \
 	tests/language/stats/means.at \
 	tests/language/stats/npar.at \
 	tests/language/stats/oneway.at \
@@ -443,6 +455,7 @@ TESTSUITE_AT = \
 	tests/output/html.at \
 	tests/output/output.at \
 	tests/output/paper-size.at \
+	tests/output/pivot-table.at \
 	tests/output/render.at \
 	tests/output/tables.at \
 	tests/output/tex.at \