projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADD FILES: Convert testsuite to use Autotest.
[pspp-builds.git]
/
tests
/
automake.mk
diff --git
a/tests/automake.mk
b/tests/automake.mk
index a342e5491460c425befc45682bc86b6b6f95263c..fd50986421a2873f28cb3dabce1250e0e2f07301 100644
(file)
--- a/
tests/automake.mk
+++ b/
tests/automake.mk
@@
-7,15
+7,13
@@
TESTS_ENVIRONMENT += PERL='$(PERL)' PG_CONFIG='$(PG_CONFIG)'
TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
TESTS_ENVIRONMENT += LC_ALL=C
TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
TESTS_ENVIRONMENT += LC_ALL=C
+TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
dist_TESTS = \
dist_TESTS = \
- tests/command/add-files.sh \
- tests/command/attributes.sh \
tests/command/beg-data.sh \
tests/command/bignum.sh \
tests/command/count.sh \
tests/command/correlation.sh \
tests/command/beg-data.sh \
tests/command/bignum.sh \
tests/command/count.sh \
tests/command/correlation.sh \
- tests/command/data-list.sh \
tests/command/do-if.sh \
tests/command/do-repeat.sh \
tests/command/erase.sh \
tests/command/do-if.sh \
tests/command/do-repeat.sh \
tests/command/erase.sh \
@@
-25,7
+23,6
@@
dist_TESTS = \
tests/command/file-label.sh \
tests/command/file-handle.sh \
tests/command/filter.sh \
tests/command/file-label.sh \
tests/command/file-handle.sh \
tests/command/filter.sh \
- tests/command/flip.sh \
tests/command/get-data-txt.sh \
tests/command/get-data-txt-examples.sh \
tests/command/get-data-txt-importcases.sh \
tests/command/get-data-txt.sh \
tests/command/get-data-txt-examples.sh \
tests/command/get-data-txt-importcases.sh \
@@
-44,9
+41,6
@@
dist_TESTS = \
tests/command/npar-chisquare.sh \
tests/command/npar-wilcoxon.sh \
tests/command/npar-sign.sh \
tests/command/npar-chisquare.sh \
tests/command/npar-wilcoxon.sh \
tests/command/npar-sign.sh \
- tests/command/oneway.sh \
- tests/command/oneway-missing.sh \
- tests/command/oneway-with-splits.sh \
tests/command/permissions.sh \
tests/command/print.sh \
tests/command/print-strings.sh \
tests/command/permissions.sh \
tests/command/print.sh \
tests/command/print-strings.sh \
@@
-140,9
+134,6
@@
dist_TESTS = \
tests/data/datasheet-test.sh \
tests/libpspp/sparse-xarray-test.sh \
tests/output/paper-size.sh \
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 \
tests/expressions/randist.sh \
tests/expressions/valuelabel.sh \
tests/expressions/variables.sh \
@@
-185,7
+176,7
@@
check_PROGRAMS += \
tests_data_datasheet_test_SOURCES = \
tests/data/datasheet-test.c
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 = \
tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
tests_libpspp_ll_test_SOURCES = \
@@
-209,6
+200,7
@@
tests_libpspp_heap_test_SOURCES = \
src/libpspp/heap.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
src/libpspp/heap.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
+ src/libpspp/temp-file.c \
tests/libpspp/heap-test.c
tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests/libpspp/heap-test.c
tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@
-259,6
+251,7
@@
tests_libpspp_range_set_test_SOURCES = \
src/libpspp/pool.h \
src/libpspp/range-set.c \
src/libpspp/range-set.h \
src/libpspp/pool.h \
src/libpspp/range-set.c \
src/libpspp/range-set.h \
+ src/libpspp/temp-file.c \
tests/libpspp/range-set-test.c
tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests/libpspp/range-set-test.c
tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@
-284,6
+277,7
@@
tests_libpspp_stringi_map_test_SOURCES = \
src/libpspp/stringi-map.c \
src/libpspp/string-set.c \
src/libpspp/stringi-set.c \
src/libpspp/stringi-map.c \
src/libpspp/string-set.c \
src/libpspp/stringi-set.c \
+ src/libpspp/temp-file.c \
tests/libpspp/stringi-map-test.c
tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests/libpspp/stringi-map-test.c
tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@
-302,6
+296,7
@@
tests_libpspp_stringi_set_test_SOURCES = \
src/libpspp/pool.c \
src/libpspp/str.c \
src/libpspp/stringi-set.c \
src/libpspp/pool.c \
src/libpspp/str.c \
src/libpspp/stringi-set.c \
+ src/libpspp/temp-file.c \
tests/libpspp/stringi-set-test.c
tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests/libpspp/stringi-set-test.c
tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@
-311,6
+306,7
@@
tests_libpspp_tower_test_SOURCES = \
src/libpspp/abt.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
src/libpspp/abt.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
+ src/libpspp/temp-file.c \
src/libpspp/tower.c \
src/libpspp/tower.h \
tests/libpspp/tower-test.c
src/libpspp/tower.c \
src/libpspp/tower.h \
tests/libpspp/tower-test.c
@@
-322,7
+318,8
@@
tests_libpspp_sparse_array_test_SOURCES = \
src/libpspp/sparse-array.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
src/libpspp/sparse-array.h \
src/libpspp/pool.c \
src/libpspp/pool.h \
- tests/libpspp/sparse-array-test.c
+ tests/libpspp/sparse-array-test.c \
+ src/libpspp/temp-file.c
tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL)
tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
@@
-330,13
+327,14
@@
tests_libpspp_sparse_xarray_test_SOURCES = \
src/libpspp/argv-parser.c \
src/libpspp/bt.c \
src/libpspp/deque.c \
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/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/t
mp
file.c \
+ src/libpspp/t
emp-
file.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
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
@@
-415,21
+413,42
@@
EXTRA_DIST += \
tests/atlocal.in \
$(srcdir)/package.m4 \
$(TESTSUITE)
tests/atlocal.in \
$(srcdir)/package.m4 \
$(TESTSUITE)
+
TESTSUITE_AT = \
TESTSUITE_AT = \
- tests/testsuite.at \
+ tests/data/calendar.at \
+ tests/language/data-io/add-files.at \
+ tests/language/data-io/data-list.at \
+ tests/language/data-io/save.at \
+ tests/language/data-io/save-translate.at \
+ tests/language/dictionary/attributes.at \
tests/language/dictionary/mrsets.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 \
tests/language/stats/descriptives.at \
tests/language/stats/aggregate.at \
tests/language/stats/autorecode.at \
tests/language/stats/crosstabs.at \
tests/language/stats/descriptives.at \
+ tests/language/stats/factor.at \
+ tests/language/stats/flip.at \
tests/language/stats/frequencies.at \
tests/language/stats/frequencies.at \
+ tests/language/stats/oneway.at \
+ tests/language/utilities/set.at \
tests/language/xforms/compute.at \
tests/language/xforms/recode.at \
tests/language/xforms/compute.at \
tests/language/xforms/recode.at \
+ tests/math/moments.at \
tests/output/render.at \
tests/output/render.at \
+ tests/output/charts.at \
tests/perl-module.at
tests/perl-module.at
+
TESTSUITE = $(srcdir)/tests/testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
TESTSUITE = $(srcdir)/tests/testsuite
DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
+$(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile
+ cp $< $@
+ for t in $(TESTSUITE_AT); do \
+ echo "m4_include([$$t])" >> $@ ;\
+ done
+
+
CHECK_LOCAL += tests_check
tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
CHECK_LOCAL += tests_check
tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
@@
-438,9
+457,9
@@
CLEAN_LOCAL += tests_clean
tests_clean:
test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C 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
AUTOTEST = $(AUTOM4TE) --language=autotest
-$(TESTSUITE): package.m4 $(
TESTSUITE_AT)
+$(TESTSUITE): package.m4 $(
srcdir)/tests/testsuite.at $(TESTSUITE_AT)
$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
mv $@.tmp $@
$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
mv $@.tmp $@