X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=095ed03579ab3c280702c1d761f8b678c0e5dbb6;hb=cee6f0eb54144da7034566fa1bcdcee22337ae6a;hp=1dba99efa1a64af7dc908280499fa67731609ad8;hpb=f0827ef96044219fea423d73147937c4c266827b;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index 1dba99efa1..095ed03579 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -16,139 +16,126 @@ # ## Process this file with automake to produce Makefile.in -*- makefile -*- -check_PROGRAMS += \ - tests/data/datasheet-test \ - tests/data/sack \ - tests/data/inexactify \ - tests/language/lexer/command-name-test \ - tests/language/lexer/scan-test \ - tests/language/lexer/segment-test \ - tests/libpspp/abt-test \ - tests/libpspp/bt-test \ - tests/libpspp/cmac-aes256-test \ - tests/libpspp/encoding-guesser-test \ - tests/libpspp/heap-test \ - 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 \ - tests/libpspp/string-map-test \ - tests/libpspp/stringi-map-test \ - tests/libpspp/string-set-test \ - tests/libpspp/stringi-set-test \ - tests/libpspp/tower-test \ - tests/libpspp/u8-istream-test \ - tests/libpspp/zip-test \ - tests/math/chart-get-ticks-format-test \ - tests/math/chart-get-scale-test \ - tests/output/render-test \ - tests/ui/syntax-gen-test - - check-programs: $(check_PROGRAMS) +check_PROGRAMS += tests/data/datasheet-test tests_data_datasheet_test_SOURCES = \ tests/data/datasheet-test.c tests_data_datasheet_test_LDADD = src/libpspp-core.la tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS) +check_PROGRAMS += tests/data/sack tests_data_sack_SOURCES = \ tests/data/sack.c tests_data_sack_LDADD = src/libpspp-core.la tests_data_sack_CFLAGS = $(AM_CFLAGS) +check_PROGRAMS += tests/data/spreadsheet-test +tests_data_spreadsheet_test_SOURCES = \ + tests/data/spreadsheet-test.c +tests_data_spreadsheet_test_LDADD = src/libpspp-core.la +tests_data_spreadsheet_test_CFLAGS = $(AM_CFLAGS) + +check_PROGRAMS += tests/libpspp/line-reader-test 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_line_reader_test_LDADD = src/libpspp-core.la +check_PROGRAMS += tests/libpspp/ll-test tests_libpspp_ll_test_SOURCES = \ src/libpspp/ll.c \ tests/libpspp/ll-test.c tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS) +check_PROGRAMS += tests/libpspp/llx-test tests_libpspp_llx_test_SOURCES = \ src/libpspp/ll.c \ src/libpspp/llx.c \ tests/libpspp/llx-test.c tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS) +check_PROGRAMS += tests/libpspp/encoding-guesser-test tests_libpspp_encoding_guesser_test_SOURCES = \ tests/libpspp/encoding-guesser-test.c -tests_libpspp_encoding_guesser_test_LDADD = \ - src/libpspp/liblibpspp.la \ - gl/libgl.la +tests_libpspp_encoding_guesser_test_LDADD = src/libpspp-core.la +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 = \ src/libpspp/hmap.c \ tests/libpspp/hmap-test.c tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +check_PROGRAMS += tests/libpspp/hmapx-test tests_libpspp_hmapx_test_SOURCES = \ src/libpspp/hmap.c \ src/libpspp/hmapx.c \ tests/libpspp/hmapx-test.c 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/liblibpspp.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 = \ src/libpspp/abt.c \ tests/libpspp/abt-test.c tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +check_PROGRAMS += tests/libpspp/bt-test tests_libpspp_bt_test_SOURCES = \ src/libpspp/bt.c \ tests/libpspp/bt-test.c tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +check_PROGRAMS += tests/libpspp/cmac-aes256-test tests_libpspp_cmac_aes256_test_SOURCES = \ src/libpspp/cmac-aes256.c \ tests/libpspp/cmac-aes256-test.c tests_libpspp_cmac_aes256_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +check_PROGRAMS += tests/libpspp/range-map-test 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_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +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 = \ 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_stringi_map_test_LDADD = src/libpspp-core.la +check_PROGRAMS += tests/libpspp/string-set-test tests_libpspp_string_set_test_SOURCES = \ src/libpspp/hash-functions.c \ src/libpspp/hmap.c \ @@ -156,31 +143,38 @@ tests_libpspp_string_set_test_SOURCES = \ tests/libpspp/string-set-test.c tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10 +check_PROGRAMS += tests/libpspp/stringi-set-test tests_libpspp_stringi_set_test_SOURCES = \ 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_stringi_set_test_LDADD = src/libpspp-core.la +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 -tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la +tests_libpspp_u8_istream_test_LDADD = src/libpspp-core.la +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 = \ 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 \ 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 check_PROGRAMS += tests/language/lexer/command-name-test @@ -190,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 @@ -204,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 = \ @@ -215,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 = \ @@ -225,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 @@ -233,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 @@ -241,11 +240,22 @@ 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/render-test -tests_output_render_test_SOURCES = tests/output/render-test.c -tests_output_render_test_LDADD = \ +check_PROGRAMS += tests/output/pivot-table-test +tests_output_pivot_table_test_SOURCES = tests/output/pivot-table-test.c +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 + +check_PROGRAMS += tests/output/ascii-test +tests_output_ascii_test_SOURCES = tests/output/ascii-test.c +tests_output_ascii_test_LDADD = \ src/libpspp.la \ src/libpspp-core.la \ $(CAIRO_LIBS) @@ -257,9 +267,34 @@ tests_ui_syntax_gen_test_LDADD = \ src/libpspp-core.la \ $(CAIRO_LIBS) +check_PROGRAMS += tests/output/tex-glyphs +tests_output_tex_glyphs_SOURCES = \ + tests/output/tex-glyphs.c +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/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 \ + tests/data/sparse.gnumeric \ + tests/data/holey.ods \ + tests/data/holey.gnumeric \ + tests/data/multisheet.ods \ + tests/data/multisheet.gnumeric \ + tests/data/repeating.ods \ + tests/data/repeating.gnumeric \ + tests/data/one-thousand-by-fifty-three.ods \ + tests/data/one-thousand-by-fifty-three.gnumeric \ tests/data/CVE-2017-10791.sav \ tests/data/CVE-2017-10792.sav \ tests/data/bcd-in.expected.cmp.gz \ @@ -268,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 \ @@ -282,7 +316,8 @@ EXTRA_DIST += \ 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/stats/llz.zsav \ + tests/utilities/regress.spv CLEANFILES += *.save pspp.* foo* @@ -301,6 +336,7 @@ TESTSUITE_AT = \ tests/data/data-in.at \ tests/data/data-out.at \ tests/data/datasheet-test.at \ + tests/data/spreadsheet-test.at \ tests/data/dictionary.at \ tests/data/file.at \ tests/data/format-guesser.at \ @@ -311,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 \ @@ -328,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 \ @@ -352,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 \ @@ -360,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 \ @@ -368,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 \ @@ -381,6 +421,7 @@ TESTSUITE_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 \ @@ -423,16 +464,19 @@ TESTSUITE_AT = \ tests/output/html.at \ tests/output/output.at \ tests/output/paper-size.at \ + tests/output/pivot-table.at \ tests/output/render.at \ tests/output/tables.at \ + tests/output/tex.at \ tests/ui/terminal/main.at \ tests/ui/syntax-gen.at \ tests/utilities/pspp-convert.at \ + tests/utilities/pspp-output.at \ tests/perl-module.at TESTSUITE = $(srcdir)/tests/testsuite DISTCLEANFILES += tests/atconfig tests/atlocal -AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities +AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:tests/math:src/ui/terminal:utilities $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk $(AM_V_GEN)printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' > $@,tmp @@ -444,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