X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=095ed03579ab3c280702c1d761f8b678c0e5dbb6;hb=cee6f0eb54144da7034566fa1bcdcee22337ae6a;hp=77a14c8dd95fce3d1e7305447f5dfc776249965d;hpb=21f20b8cb6460fd5ac9db7fde038bc00cfa80831;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 77a14c8dd9..095ed03579 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -62,7 +62,7 @@ check_PROGRAMS += tests/libpspp/heap-test tests_libpspp_heap_test_SOURCES = \ 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_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/hmap-test tests_libpspp_hmap_test_SOURCES = \ @@ -79,7 +79,7 @@ tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 check_PROGRAMS += tests/libpspp/i18n-test tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c -tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la +tests_libpspp_i18n_test_LDADD = src/libpspp-core.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/abt-test tests_libpspp_abt_test_SOURCES = \ @@ -110,24 +110,24 @@ check_PROGRAMS += tests/libpspp/range-set-test tests_libpspp_range_set_test_SOURCES = \ 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_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/range-tower-test 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_range_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/str-test tests_libpspp_str_test_SOURCES = \ tests/libpspp/str-test.c -tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la +tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/string-map-test tests_libpspp_string_map_test_SOURCES = \ 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_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/stringi-map-test tests_libpspp_stringi_map_test_SOURCES = \ @@ -153,7 +153,7 @@ check_PROGRAMS += tests/libpspp/tower-test tests_libpspp_tower_test_SOURCES = \ 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_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/u8-istream-test tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c @@ -163,7 +163,7 @@ check_PROGRAMS += tests/libpspp/sparse-array-test tests_libpspp_sparse_array_test_SOURCES = \ 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_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/sparse-xarray-test tests_libpspp_sparse_xarray_test_SOURCES = \ @@ -171,7 +171,8 @@ tests_libpspp_sparse_xarray_test_SOURCES = \ tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \ src/libpspp-core.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/data/inexactify tests_data_inexactify_SOURCES = tests/data/inexactify.c @@ -183,7 +184,8 @@ tests_language_lexer_command_name_test_SOURCES = \ tests/language/lexer/command-name-test.c tests_language_lexer_command_name_test_LDADD = \ src/libpspp/liblibpspp.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS) check_PROGRAMS += tests/language/lexer/scan-test @@ -197,7 +199,8 @@ tests_language_lexer_scan_test_SOURCES = \ tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS) tests_language_lexer_scan_test_LDADD = \ src/libpspp/liblibpspp.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/language/lexer/segment-test tests_language_lexer_segment_test_SOURCES = \ @@ -208,7 +211,8 @@ tests_language_lexer_segment_test_SOURCES = \ tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS) tests_language_lexer_segment_test_LDADD = \ src/libpspp/liblibpspp.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/libpspp/zip-test tests_libpspp_zip_test_SOURCES = \ @@ -218,7 +222,8 @@ tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS) tests_libpspp_zip_test_LDADD = \ src/libpspp/liblibpspp.la \ src/libpspp-core.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/math/chart-get-scale-test tests_math_chart_get_scale_test_SOURCES = tests/math/chart-get-scale-test.c @@ -226,7 +231,8 @@ tests_math_chart_get_scale_test_LDADD = \ src/math/libpspp-math.la \ src/libpspp/liblibpspp.la \ src/libpspp-core.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/math/chart-get-ticks-format-test tests_math_chart_get_ticks_format_test_SOURCES = tests/math/chart-get-ticks-format-test.c @@ -234,7 +240,8 @@ tests_math_chart_get_ticks_format_test_LDADD = \ src/math/libpspp-math.la \ src/libpspp/liblibpspp.la \ src/libpspp-core.la \ - gl/libgl.la + gl/libgl.la \ + $(LIB_GETRANDOM) check_PROGRAMS += tests/output/pivot-table-test tests_output_pivot_table_test_SOURCES = tests/output/pivot-table-test.c @@ -242,6 +249,7 @@ tests_output_pivot_table_test_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ gl/libgl.la \ + $(LIB_GETRANDOM) \ $(CAIRO_LIBS) EXTRA_DIST += tests/output/look.stt @@ -262,18 +270,19 @@ tests_ui_syntax_gen_test_LDADD = \ check_PROGRAMS += tests/output/tex-glyphs tests_output_tex_glyphs_SOURCES = \ tests/output/tex-glyphs.c -tests_output_tex_glyphs_LDADD = src/libpspp-core.la src/output/liboutput.la +tests_output_tex_glyphs_LDADD = src/output/liboutput.la src/libpspp-core.la tests_output_tex_glyphs_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output check_PROGRAMS += tests/output/tex-strings tests_output_tex_strings_SOURCES = \ tests/output/tex-strings.c -tests_output_tex_strings_LDADD = src/libpspp-core.la src/output/liboutput.la +tests_output_tex_strings_LDADD = src/output/liboutput.la src/libpspp-core.la tests_output_tex_strings_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output EXTRA_DIST += \ tests/coverage.sh \ + tests/data/repeating-2.ods \ tests/data/simple.ods \ tests/data/simple.gnumeric \ tests/data/sparse.ods \ @@ -294,7 +303,6 @@ EXTRA_DIST += \ tests/data/hotel-encrypted.sav \ tests/data/legacy-in.expected.cmp.gz \ tests/data/num-in.expected.gz \ - tests/data/num-out-cmp.pl \ tests/data/num-out.expected.cmp.gz \ tests/data/test-date-input.py \ tests/data/test-time-input.py \ @@ -339,6 +347,7 @@ TESTSUITE_AT = \ tests/data/sys-file.at \ tests/data/encrypted-file.at \ tests/language/command.at \ + tests/language/control/define.at \ tests/language/control/do-if.at \ tests/language/control/do-repeat.at \ tests/language/control/loop.at \ @@ -356,6 +365,8 @@ TESTSUITE_AT = \ tests/language/data-io/list.at \ tests/language/data-io/match-files.at \ tests/language/data-io/matrix-data.at \ + tests/language/data-io/matrix-reader.at \ + tests/language/data-io/mconvert.at \ tests/language/data-io/print-space.at \ tests/language/data-io/print.at \ tests/language/data-io/save.at \ @@ -380,7 +391,6 @@ TESTSUITE_AT = \ tests/language/expressions/parse.at \ tests/language/lexer/command-name.at \ tests/language/lexer/lexer.at \ - tests/language/lexer/q2c.at \ tests/language/lexer/scan.at \ tests/language/lexer/segment.at \ tests/language/lexer/variable-parser.at \ @@ -388,6 +398,7 @@ TESTSUITE_AT = \ tests/language/stats/autorecode.at \ tests/language/stats/correlations.at \ tests/language/stats/crosstabs.at \ + tests/language/stats/ctables.at \ tests/language/stats/descriptives.at \ tests/language/stats/examine.at \ tests/language/stats/graph.at \ @@ -396,6 +407,7 @@ TESTSUITE_AT = \ tests/language/stats/frequencies.at \ tests/language/stats/glm.at \ tests/language/stats/logistic.at \ + tests/language/stats/matrix.at \ tests/language/stats/means.at \ tests/language/stats/npar.at \ tests/language/stats/oneway.at \ @@ -476,8 +488,16 @@ $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk EXTRA_DIST += tests/testsuite.at +# Generate a TableLook that prints all layers of pivot tables. +check_DATA = tests/all-layers.stt +tests/all-layers.stt: utilities/pspp-output + $(AM_V_GEN)$< get-table-look - $@.tmp + $(AM_V_at)if grep 'printAllLayers="false"' $@.tmp >/dev/null; then :; else \ + echo >&2 "$<: expected printAllLayers=\"false\""; exit 1; fi + $(AM_v_at)sed 's/printAllLayers="false"/printAllLayers="true"/' < $@.tmp > $@ + CHECK_LOCAL += tests_check -tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) +tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS) $(check_DATA) XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) RUNNER='$(RUNNER)' $(TESTSUITEFLAGS) CLEAN_LOCAL += tests_clean