X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=b8e4c2dd19613c3fae94fd8f7641d4c2f13fcb1c;hb=refs%2Fheads%2Flexer;hp=a6d8de3a236d834f6a06c81c34ac9f364ac13dd9;hpb=d7965d19e72e6ba63fa807b2ea27adaedc9da109;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index a6d8de3a23..b8e4c2dd19 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -14,10 +14,12 @@ check_PROGRAMS += \ tests/libpspp/hmap-test \ tests/libpspp/hmapx-test \ tests/libpspp/i18n-test \ + tests/libpspp/line-reader-test \ tests/libpspp/ll-test \ tests/libpspp/llx-test \ tests/libpspp/range-map-test \ tests/libpspp/range-set-test \ + tests/libpspp/range-tower-test \ tests/libpspp/sparse-array-test \ tests/libpspp/sparse-xarray-test \ tests/libpspp/str-test \ @@ -27,189 +29,140 @@ 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) tests_data_datasheet_test_SOURCES = \ tests/data/datasheet-test.c -tests_data_datasheet_test_LDADD = src/libpspp-core.la $(LIBINTL) +tests_data_datasheet_test_LDADD = src/libpspp-core.la tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) tests_data_sack_SOURCES = \ tests/data/sack.c -tests_data_sack_LDADD = src/libpspp-core.la $(LIBINTL) +tests_data_sack_LDADD = src/libpspp-core.la tests_data_sack_CFLAGS = $(AM_CFLAGS) +tests_libpspp_line_reader_test_SOURCES = tests/libpspp/line-reader-test.c +tests_libpspp_line_reader_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la + tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ tests/libpspp/ll-test.c -tests_libpspp_ll_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_llx_test_SOURCES = \ src/libpspp/ll.c \ src/libpspp/llx.c \ tests/libpspp/llx-test.c -tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_encoding_guesser_test_SOURCES = \ tests/libpspp/encoding-guesser-test.c -tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la +tests_libpspp_encoding_guesser_test_LDADD = \ + src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la tests_libpspp_hmap_test_SOURCES = \ src/libpspp/hmap.c \ tests/libpspp/hmap-test.c -tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_hmapx_test_SOURCES = \ src/libpspp/hmap.c \ src/libpspp/hmapx.c \ tests/libpspp/hmapx-test.c -tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c -tests_libpspp_i18n_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) +tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la tests_libpspp_abt_test_SOURCES = \ src/libpspp/abt.c \ tests/libpspp/abt-test.c -tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_bt_test_SOURCES = \ src/libpspp/bt.c \ tests/libpspp/bt-test.c -tests_libpspp_bt_test_LDADD = gl/libgl.la tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_range_map_test_SOURCES = \ src/libpspp/bt.c \ src/libpspp/range-map.c \ tests/libpspp/range-map-test.c -tests_libpspp_range_map_test_LDADD = gl/libgl.la $(LIBINTL) 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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la + +tests_libpspp_range_tower_test_SOURCES = \ + tests/libpspp/range-tower-test.c +tests_libpspp_range_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_range_tower_test_LDADD = src/libpspp/liblibpspp.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 $(LIBINTL) +tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la tests_libpspp_string_set_test_SOURCES = \ src/libpspp/hash-functions.c \ src/libpspp/hmap.c \ src/libpspp/string-set.c \ tests/libpspp/string-set-test.c -tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL) 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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.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_u8_istream_test_LDADD = src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) + 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/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) -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 \ src/language/lexer/command-name.c \ tests/language/lexer/command-name-test.c tests_language_lexer_command_name_test_LDADD = \ - src/libpspp/libpspp.la \ - gl/libgl.la \ - $(LIBINTL) + src/libpspp/liblibpspp.la \ + gl/libgl.la tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) check_PROGRAMS += tests/language/lexer/scan-test @@ -219,35 +172,38 @@ 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_LDADD = gl/libgl.la $(LIBINTL) tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS) +tests_language_lexer_scan_test_LDADD = \ + src/libpspp/liblibpspp.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_LDADD = gl/libgl.la $(LIBINTL) tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS) +tests_language_lexer_segment_test_LDADD = \ + src/libpspp/liblibpspp.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/liblibpspp.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 = \ src/libpspp.la \ src/libpspp-core.la \ - $(CAIRO_LIBS) \ - $(LIBICONV) \ - $(LIBINTL) + $(CAIRO_LIBS) EXTRA_DIST += \ tests/coverage.sh \ @@ -260,7 +216,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* @@ -293,8 +250,9 @@ TESTSUITE_AT = \ tests/language/data-io/add-files.at \ tests/language/data-io/data-list.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 \ @@ -307,6 +265,7 @@ TESTSUITE_AT = \ tests/language/data-io/save-translate.at \ tests/language/data-io/update.at \ tests/language/dictionary/attributes.at \ + tests/language/dictionary/formats.at \ tests/language/dictionary/missing-values.at \ tests/language/dictionary/mrsets.at \ tests/language/dictionary/rename-variables.at \ @@ -333,8 +292,11 @@ 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 \ tests/language/stats/rank.at \ tests/language/stats/regression.at \ tests/language/stats/reliability.at \ @@ -342,10 +304,12 @@ 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 \ tests/language/utilities/set.at \ + tests/language/utilities/show.at \ tests/language/utilities/title.at \ tests/language/xforms/compute.at \ tests/language/xforms/count.at \ @@ -360,10 +324,12 @@ TESTSUITE_AT = \ tests/libpspp/hmap.at \ tests/libpspp/hmapx.at \ tests/libpspp/i18n.at \ + tests/libpspp/line-reader.at \ tests/libpspp/ll.at \ tests/libpspp/llx.at \ tests/libpspp/range-map.at \ tests/libpspp/range-set.at \ + tests/libpspp/range-tower.at \ tests/libpspp/sparse-array.at \ tests/libpspp/sparse-xarray-test.at \ tests/libpspp/str.at \ @@ -373,8 +339,10 @@ 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 \ tests/output/charts.at \ tests/output/output.at \ tests/output/paper-size.at \ @@ -422,11 +390,36 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac # valgrind support for Autotest testsuite valgrind_wrappers = \ - tests/valgrind/pspp \ - tests/valgrind/render-test + tests/valgrind/datasheet-test \ + tests/valgrind/command-name-test \ + tests/valgrind/scan-test \ + tests/valgrind/segment-test \ + tests/valgrind/abt-test \ + tests/valgrind/bt-test \ + tests/valgrind/encoding-guesser-test \ + tests/valgrind/heap-test \ + tests/valgrind/hmap-test \ + tests/valgrind/hmapx-test \ + tests/valgrind/i18n-test \ + tests/valgrind/ll-test \ + tests/valgrind/llx-test \ + tests/valgrind/range-map-test \ + tests/valgrind/range-set-test \ + tests/valgrind/range-tower-test \ + tests/valgrind/sparse-array-test \ + tests/valgrind/sparse-xarray-test \ + tests/valgrind/str-test \ + tests/valgrind/string-map-test \ + tests/valgrind/stringi-map-test \ + tests/valgrind/string-set-test \ + tests/valgrind/stringi-set-test \ + tests/valgrind/tower-test \ + tests/valgrind/u8-istream-test \ + tests/valgrind/render-test \ + tests/valgrind/pspp $(valgrind_wrappers): tests/valgrind-wrapper.in - @test -d tests/valgrind || mkdir tests/valgrind + @$(MKDIR_P) tests/valgrind sed -e 's,[@]wrap_program[@],$@,' \ $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp chmod +x $@.tmp