MEANS: This command is IMO now stable enough to be used. Adding to command.def

[pspp-builds.git] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index d9012a24083b8ab096613f566925eeb8502f393b..1a9ef8442120a5de7db357fc540b9320e63b155a 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -27,6 +27,7 @@ check_PROGRAMS += \
        tests/libpspp/stringi-set-test \
        tests/libpspp/tower-test \
        tests/libpspp/u8-istream-test \
+       tests/libpspp/zip-test \
        tests/output/render-test
 
 check-programs: $(check_PROGRAMS)
@@ -57,11 +58,9 @@ tests_libpspp_encoding_guesser_test_SOURCES = \
 tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_heap_test_SOURCES = \
-       src/libpspp/heap.c \
-       src/libpspp/pool.c \
-       src/libpspp/temp-file.c \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_heap_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_hmap_test_SOURCES = \
        src/libpspp/hmap.c \
@@ -94,36 +93,23 @@ tests_libpspp_range_map_test_SOURCES = \
 tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_set_test_SOURCES = \
-       src/libpspp/bt.c \
-       src/libpspp/pool.c \
-       src/libpspp/range-set.c \
-       src/libpspp/temp-file.c \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_range_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
 tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
 
 tests_libpspp_string_map_test_SOURCES = \
-       src/libpspp/hash-functions.c \
-       src/libpspp/hmap.c \
-       src/libpspp/string-map.c \
-       src/libpspp/string-set.c \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_string_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_stringi_map_test_SOURCES = \
-       src/libpspp/hash-functions.c \
-       src/libpspp/hmap.c \
-       src/libpspp/pool.c \
-       src/libpspp/str.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_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_stringi_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_string_set_test_SOURCES = \
        src/libpspp/hash-functions.c \
@@ -133,57 +119,30 @@ tests_libpspp_string_set_test_SOURCES = \
 tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_stringi_set_test_SOURCES = \
-       src/libpspp/hash-functions.c \
-       src/libpspp/hmap.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_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_stringi_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_tower_test_SOURCES = \
-       src/libpspp/abt.c \
-       src/libpspp/pool.c \
-       src/libpspp/temp-file.c \
-       src/libpspp/tower.c \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_tower_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
 tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_sparse_array_test_SOURCES = \
-       src/libpspp/sparse-array.c \
-       src/libpspp/pool.c \
-       tests/libpspp/sparse-array-test.c \
-       src/libpspp/temp-file.c
+       tests/libpspp/sparse-array-test.c 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 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/temp-file.c \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
-noinst_PROGRAMS += tests/dissect-sysfile
-tests_dissect_sysfile_SOURCES = \
-       src/libpspp/integer-format.c \
-       src/libpspp/float-format.c \
-       tests/dissect-sysfile.c
-tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
-
 check_PROGRAMS += tests/language/lexer/command-name-test
 tests_language_lexer_command_name_test_SOURCES = \
        src/data/identifier.c \
@@ -201,24 +160,31 @@ tests_language_lexer_scan_test_SOURCES = \
        src/language/lexer/scan.c \
        src/language/lexer/segment.c \
        src/language/lexer/token.c \
-       src/libpspp/pool.c \
-       src/libpspp/prompt.c \
-       src/libpspp/str.c \
-       src/libpspp/temp-file.c \
        tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_scan_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test
 tests_language_lexer_segment_test_SOURCES = \
        src/data/identifier.c \
        src/language/lexer/command-name.c \
        src/language/lexer/segment.c \
-       src/libpspp/pool.c \
-       src/libpspp/prompt.c \
-       src/libpspp/str.c \
-       src/libpspp/temp-file.c \
        tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_segment_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
+
+check_PROGRAMS += tests/libpspp/zip-test
+tests_libpspp_zip_test_SOURCES = \
+       tests/libpspp/zip-test.c
+tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
+tests_libpspp_zip_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
+
 
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
@@ -238,7 +204,8 @@ 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/Book1.gnm.unzipped \
+        tests/language/data-io/test.ods
 
 CLEANFILES += *.save pspp.* foo*
 
@@ -273,7 +240,7 @@ TESTSUITE_AT = \
        tests/language/data-io/data-reader.at \
        tests/language/data-io/dataset.at \
        tests/language/data-io/file-handle.at \
-       tests/language/data-io/get-data-gnm.at \
+       tests/language/data-io/get-data-spreadsheet.at \
        tests/language/data-io/get-data-psql.at \
        tests/language/data-io/get-data-txt.at \
        tests/language/data-io/get.at \
@@ -313,6 +280,8 @@ TESTSUITE_AT = \
        tests/language/stats/factor.at \
        tests/language/stats/flip.at \
        tests/language/stats/frequencies.at \
+       tests/language/stats/glm.at \
+       tests/language/stats/means.at \
        tests/language/stats/npar.at \
        tests/language/stats/oneway.at \
        tests/language/stats/quick-cluster.at \
@@ -323,6 +292,7 @@ TESTSUITE_AT = \
        tests/language/stats/sort-cases.at \
        tests/language/stats/t-test.at \
        tests/language/utilities/cache.at \
+       tests/language/utilities/cd.at \
        tests/language/utilities/date.at \
        tests/language/utilities/insert.at \
        tests/language/utilities/permissions.at \
@@ -354,6 +324,7 @@ TESTSUITE_AT = \
        tests/libpspp/stringi-set.at \
        tests/libpspp/tower.at \
        tests/libpspp/u8-istream.at \
+       tests/libpspp/zip.at \
        tests/math/moments.at \
        tests/math/randist.at \
        tests/output/ascii.at \