X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=32e083e75291fbf5f23ac430ed653b01c6da50ca;hb=660d222c1c6e484e5887ac9920d095ea7aaa0e38;hp=537bfef635c9bba9b00423d45527e19ef0eebc9b;hpb=f751a381d7b792ee539ff2297a2b1ab9afe2d8c3;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 537bfef635..32e083e752 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 \ @@ -304,11 +312,12 @@ EXTRA_DIST += \ tests/data/test-decrypted.spv \ tests/data/test-encrypted.spv \ tests/language/mann-whitney.txt \ - tests/language/data-io/Book1.gnm.unzipped \ - tests/language/data-io/test.ods \ - tests/language/data-io/newone.ods \ - tests/language/data-io/readnames.ods \ - tests/language/stats/llz.zsav \ + tests/language/commands/Book1.gnm.unzipped \ + tests/language/commands/test.ods \ + tests/language/commands/newone.ods \ + tests/language/commands/readnames.ods \ + tests/language/commands/nhtsa.sav \ + tests/language/commands/llz.zsav \ tests/utilities/regress.spv CLEANFILES += *.save pspp.* foo* @@ -339,86 +348,95 @@ TESTSUITE_AT = \ tests/data/sys-file.at \ tests/data/encrypted-file.at \ tests/language/command.at \ - tests/language/control/do-if.at \ - tests/language/control/do-repeat.at \ - tests/language/control/loop.at \ - tests/language/control/temporary.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-spreadsheet.at \ - tests/language/data-io/get-data-psql.at \ - tests/language/data-io/get-data-txt.at \ - tests/language/data-io/get.at \ - tests/language/data-io/inpt-pgm.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/print-space.at \ - tests/language/data-io/print.at \ - tests/language/data-io/save.at \ - tests/language/data-io/save-translate.at \ - tests/language/data-io/update.at \ - tests/language/dictionary/attributes.at \ - tests/language/dictionary/apply.at \ - tests/language/dictionary/delete-variables.at \ - tests/language/dictionary/formats.at \ - tests/language/dictionary/missing-values.at \ - tests/language/dictionary/mrsets.at \ - tests/language/dictionary/modify-variables.at \ - tests/language/dictionary/rename-variables.at \ - tests/language/dictionary/sort-variables.at \ - tests/language/dictionary/split-file.at \ - tests/language/dictionary/sys-file-info.at \ - tests/language/dictionary/value-labels.at \ - tests/language/dictionary/variable-display.at \ - tests/language/dictionary/vector.at \ - tests/language/dictionary/weight.at \ - tests/language/expressions/evaluate.at \ - tests/language/expressions/parse.at \ tests/language/lexer/command-name.at \ tests/language/lexer/lexer.at \ tests/language/lexer/scan.at \ tests/language/lexer/segment.at \ tests/language/lexer/variable-parser.at \ - tests/language/stats/aggregate.at \ - tests/language/stats/autorecode.at \ - tests/language/stats/correlations.at \ - tests/language/stats/crosstabs.at \ - tests/language/stats/descriptives.at \ - tests/language/stats/examine.at \ - tests/language/stats/graph.at \ - tests/language/stats/factor.at \ - tests/language/stats/flip.at \ - tests/language/stats/frequencies.at \ - tests/language/stats/glm.at \ - tests/language/stats/logistic.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 \ - tests/language/stats/roc.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/host.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 \ - tests/language/xforms/recode.at \ - tests/language/xforms/sample.at \ - tests/language/xforms/select-if.at \ + tests/language/expressions/evaluate.at \ + tests/language/expressions/parse.at \ + tests/language/commands/add-files.at \ + tests/language/commands/aggregate.at \ + tests/language/commands/apply.at \ + tests/language/commands/attributes.at \ + tests/language/commands/autorecode.at \ + tests/language/commands/cache.at \ + tests/language/commands/cd.at \ + tests/language/commands/compute.at \ + tests/language/commands/correlations.at \ + tests/language/commands/count.at \ + tests/language/commands/crosstabs.at \ + tests/language/commands/ctables.at \ + tests/language/commands/data-list.at \ + tests/language/commands/data-reader.at \ + tests/language/commands/dataset.at \ + tests/language/commands/date.at \ + tests/language/commands/define.at \ + tests/language/commands/delete-variables.at \ + tests/language/commands/descriptives.at \ + tests/language/commands/do-if.at \ + tests/language/commands/do-repeat.at \ + tests/language/commands/examine.at \ + tests/language/commands/factor.at \ + tests/language/commands/file-handle.at \ + tests/language/commands/flip.at \ + tests/language/commands/formats.at \ + tests/language/commands/frequencies.at \ + tests/language/commands/get-data-psql.at \ + tests/language/commands/get-data-spreadsheet.at \ + tests/language/commands/get-data-txt.at \ + tests/language/commands/get-data.at \ + tests/language/commands/get.at \ + tests/language/commands/glm.at \ + tests/language/commands/graph.at \ + tests/language/commands/host.at \ + tests/language/commands/inpt-pgm.at \ + tests/language/commands/insert.at \ + tests/language/commands/leave.at \ + tests/language/commands/list.at \ + tests/language/commands/logistic.at \ + tests/language/commands/loop.at \ + tests/language/commands/match-files.at \ + tests/language/commands/matrix-data.at \ + tests/language/commands/matrix-reader.at \ + tests/language/commands/matrix.at \ + tests/language/commands/mconvert.at \ + tests/language/commands/means.at \ + tests/language/commands/missing-values.at \ + tests/language/commands/mrsets.at \ + tests/language/commands/npar.at \ + tests/language/commands/numeric.at \ + tests/language/commands/oneway.at \ + tests/language/commands/output.at \ + tests/language/commands/permissions.at \ + tests/language/commands/print-space.at \ + tests/language/commands/print.at \ + tests/language/commands/quick-cluster.at \ + tests/language/commands/rank.at \ + tests/language/commands/recode.at \ + tests/language/commands/regression.at \ + tests/language/commands/reliability.at \ + tests/language/commands/rename-variables.at \ + tests/language/commands/roc.at \ + tests/language/commands/sample.at \ + tests/language/commands/save-translate.at \ + tests/language/commands/save.at \ + tests/language/commands/select-if.at \ + tests/language/commands/set.at \ + tests/language/commands/show.at \ + tests/language/commands/sort-cases.at \ + tests/language/commands/sort-variables.at \ + tests/language/commands/split-file.at \ + tests/language/commands/string.at \ + tests/language/commands/sys-file-info.at \ + tests/language/commands/t-test.at \ + tests/language/commands/temporary.at \ + tests/language/commands/title.at \ + tests/language/commands/update.at \ + tests/language/commands/value-labels.at \ + tests/language/commands/variable-display.at \ + tests/language/commands/vector.at \ + tests/language/commands/weight.at \ tests/libpspp/abt.at \ tests/libpspp/bt.at \ tests/libpspp/encoding-guesser.at \ @@ -475,8 +493,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