X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=16a0d35202242e76e3cda5aa96dcdd17c7d99af8;hb=24ab436df2f3f115c1cb949dbf0a932cda7667b2;hp=840f56b04764429d467abef722d26100e7808e7b;hpb=2f7b367bf796c63c595ac837b716cce535ffd5bf;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 840f56b047..16a0d35202 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -55,14 +55,14 @@ 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_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 \ @@ -76,7 +76,7 @@ tests_libpspp_hmapx_test_SOURCES = \ 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 +tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la tests_libpspp_abt_test_SOURCES = \ src/libpspp/abt.c \ @@ -95,36 +95,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/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 +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_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_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 \ @@ -134,47 +121,27 @@ 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/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_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.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_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 @@ -184,7 +151,7 @@ tests_language_lexer_command_name_test_SOURCES = \ src/language/lexer/command-name.c \ tests/language/lexer/command-name-test.c tests_language_lexer_command_name_test_LDADD = \ - src/libpspp/libpspp.la \ + src/libpspp/liblibpspp.la \ gl/libgl.la tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) @@ -195,35 +162,30 @@ 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/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_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 = \ - 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/liblibpspp.la \ + gl/libgl.la check_PROGRAMS += tests/output/render-test @@ -321,6 +283,7 @@ TESTSUITE_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 \