X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=dceb82f74be869328cb15ba222d56599b2d9c22d;hb=3c3d40ddf4819a9bf2c24d0c10c6bdc4ec525b96;hp=1145d645af31ba0faf9412b409cf32f5cb4212ec;hpb=3e501944c450015e03cbe147267d3e0866d6c2d9;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 1145d645af..dceb82f74b 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -27,31 +27,30 @@ 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_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 = \ @@ -63,42 +62,37 @@ tests_libpspp_heap_test_SOURCES = \ 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/libpspp.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/libpspp.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 = \ @@ -107,12 +101,12 @@ tests_libpspp_range_set_test_SOURCES = \ 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/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 $(LIBINTL) +tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la tests_libpspp_string_map_test_SOURCES = \ src/libpspp/hash-functions.c \ @@ -120,8 +114,8 @@ tests_libpspp_string_map_test_SOURCES = \ 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/libpspp.la gl/libgl.la tests_libpspp_stringi_map_test_SOURCES = \ src/libpspp/hash-functions.c \ @@ -133,15 +127,14 @@ tests_libpspp_stringi_map_test_SOURCES = \ 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/libpspp.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 = \ @@ -152,8 +145,8 @@ tests_libpspp_stringi_set_test_SOURCES = \ 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/libpspp.la gl/libgl.la tests_libpspp_tower_test_SOURCES = \ src/libpspp/abt.c \ @@ -161,8 +154,8 @@ tests_libpspp_tower_test_SOURCES = \ 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/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 @@ -172,8 +165,8 @@ tests_libpspp_sparse_array_test_SOURCES = \ 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_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 \ @@ -188,19 +181,11 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ 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/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_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 \ @@ -208,8 +193,7 @@ tests_language_lexer_command_name_test_SOURCES = \ tests/language/lexer/command-name-test.c tests_language_lexer_command_name_test_LDADD = \ src/libpspp/libpspp.la \ - gl/libgl.la \ - $(LIBINTL) + gl/libgl.la tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) check_PROGRAMS += tests/language/lexer/scan-test @@ -224,8 +208,10 @@ tests_language_lexer_scan_test_SOURCES = \ 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/libpspp.la \ + gl/libgl.la check_PROGRAMS += tests/language/lexer/segment-test tests_language_lexer_segment_test_SOURCES = \ @@ -237,17 +223,32 @@ tests_language_lexer_segment_test_SOURCES = \ 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/libpspp.la \ + gl/libgl.la + +check_PROGRAMS += tests/libpspp/zip-test +tests_libpspp_zip_test_SOURCES = \ + src/libpspp/str.c \ + src/libpspp/pool.c \ + src/libpspp/temp-file.c \ + src/libpspp/inflate.c \ + src/libpspp/zip-reader.c \ + src/libpspp/zip-writer.c \ + 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 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 +261,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 +295,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 \ @@ -334,6 +337,7 @@ 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/npar.at \ tests/language/stats/oneway.at \ tests/language/stats/quick-cluster.at \ @@ -344,6 +348,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 \ @@ -375,6 +380,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 \