temp-file: Rename "ext-array" (for "external array").

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 9b09474c35c5adb68c8b57e7fa57740203a5fab0..46524f9aa233a762ff53d70fa80d4f3725cde78e 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -7,6 +7,7 @@ TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)'
 TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
 
 TESTS_ENVIRONMENT += LC_ALL=C
+TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
        tests/command/add-files.sh \
@@ -140,9 +141,6 @@ dist_TESTS = \
        tests/data/datasheet-test.sh \
        tests/libpspp/sparse-xarray-test.sh \
        tests/output/paper-size.sh \
-       tests/stats/moments.sh \
-       tests/expressions/expressions.sh \
-       tests/expressions/epoch.sh \
        tests/expressions/randist.sh \
        tests/expressions/valuelabel.sh \
        tests/expressions/variables.sh \
@@ -185,7 +183,7 @@ check_PROGRAMS += \
 
 tests_data_datasheet_test_SOURCES = \
        tests/data/datasheet-test.c
-tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la $(LIBINTL) 
+tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) 
 tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_ll_test_SOURCES = \
@@ -330,13 +328,13 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
        src/libpspp/argv-parser.c \
        src/libpspp/bt.c \
        src/libpspp/deque.c \
+       src/libpspp/ext-array.c \
        src/libpspp/model-checker.c \
        src/libpspp/range-set.c \
        src/libpspp/sparse-array.c \
        src/libpspp/sparse-xarray.c \
        src/libpspp/str.c \
        src/libpspp/pool.c \
-       src/libpspp/tmpfile.c \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@ -417,7 +415,9 @@ EXTRA_DIST += \
        $(TESTSUITE)
 TESTSUITE_AT = \
        tests/testsuite.at \
+       tests/data/calendar.at \
        tests/language/dictionary/mrsets.at \
+       tests/language/expressions/evaluate.at \
        tests/language/stats/aggregate.at \
        tests/language/stats/autorecode.at \
        tests/language/stats/crosstabs.at \
@@ -426,6 +426,7 @@ TESTSUITE_AT = \
        tests/language/stats/frequencies.at \
        tests/language/xforms/compute.at \
        tests/language/xforms/recode.at \
+       tests/math/moments.at \
        tests/output/render.at \
        tests/perl-module.at
 TESTSUITE = $(srcdir)/tests/testsuite
@@ -439,7 +440,7 @@ CLEAN_LOCAL += tests_clean
 tests_clean:
        test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
-AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te
+AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
        $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at