X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fautomake.mk;h=e5d3819c47188bf8e296c3cece8e5035a7be1837;hb=851edb461d234263f56c36ad5b329cccd8c26c55;hp=77a14c8dd95fce3d1e7305447f5dfc776249965d;hpb=21f20b8cb6460fd5ac9db7fde038bc00cfa80831;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 77a14c8dd9..e5d3819c47 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -262,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 \
@@ -294,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 \
@@ -339,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 \
@@ -356,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 \
@@ -380,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 \
@@ -388,6 +390,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 \
@@ -396,6 +399,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 \