X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=32e083e75291fbf5f23ac430ed653b01c6da50ca;hb=refs%2Fheads%2Fpivot-outer-borders;hp=b140caa31c98842b4930b43bee8839dcb4bdbfb7;hpb=b99f8bbb318e191f863d5579034ce87dd254d40f;p=pspp diff --git a/tests/automake.mk b/tests/automake.mk index b140caa31c..32e083e752 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -1,138 +1,141 @@ +# PSPP - a program for statistical analysis. +# Copyright (C) 2017 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# ## 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_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 \ @@ -140,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.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 @@ -174,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 @@ -188,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 = \ @@ -199,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 = \ @@ -209,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 @@ -217,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 @@ -225,15 +240,25 @@ 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) check_PROGRAMS += tests/ui/syntax-gen-test tests_ui_syntax_gen_test_SOURCES = tests/ui/syntax-gen-test.c @@ -242,24 +267,58 @@ 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 \ tests/data/binhex-in.expected.cmp.gz \ tests/data/binhex-out.expected.gz \ 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 \ tests/data/v13.sav \ tests/data/v14.sav \ tests/data/test-encrypted.sps \ - tests/language/data-io/Book1.gnm.unzipped \ - tests/language/data-io/test.ods \ - tests/language/data-io/newone.ods \ - tests/language/stats/llz.zsav + tests/data/test-decrypted.spv \ + tests/data/test-encrypted.spv \ + tests/language/mann-whitney.txt \ + 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* @@ -278,90 +337,106 @@ 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 \ + tests/data/mdd-file.at \ tests/data/pc+-file-reader.at \ tests/data/por-file.at \ tests/data/sys-file-reader.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/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/delete-variables.at \ - tests/language/dictionary/formats.at \ - tests/language/dictionary/missing-values.at \ - tests/language/dictionary/mrsets.at \ - tests/language/dictionary/rename-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/q2c.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/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 \ @@ -391,28 +466,44 @@ TESTSUITE_AT = \ tests/math/randist.at \ tests/output/ascii.at \ tests/output/charts.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 $(TESTSUITE) -AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities +DISTCLEANFILES += tests/atconfig tests/atlocal +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)cp $< $@ + $(AM_V_GEN)printf '\043 Generated automatically -- do not modify! -*- buffer-read-only: t -*-\n' > $@,tmp + $(AM_V_at)cat $< >> $@,tmp $(AM_V_at)for t in $(TESTSUITE_AT); do \ - echo "m4_include([$$t])" >> $@ ;\ + echo "m4_include([$$t])" >> $@,tmp ;\ done + mv $@,tmp $@ + 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) - XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS) +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 tests_clean: @@ -420,8 +511,9 @@ tests_clean: AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest -$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) - $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp +$(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) + $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | $(SED) 's/@<00A0>@/ /g' > $@.tmp + test -s $@.tmp $(AM_V_at)mv $@.tmp $@ # The `:;' works around a Bash 3.2 bug when the output is not writeable. @@ -435,53 +527,12 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_BUGREPORT], [$(PACKAGE_BUGREPORT)])' && \ echo 'm4_define([AT_PACKAGE_URL], [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' - -# valgrind support for Autotest testsuite - -valgrind_wrappers = \ - tests/valgrind/datasheet-test \ - tests/valgrind/command-name-test \ - tests/valgrind/scan-test \ - tests/valgrind/segment-test \ - tests/valgrind/abt-test \ - tests/valgrind/bt-test \ - tests/valgrind/encoding-guesser-test \ - tests/valgrind/heap-test \ - tests/valgrind/hmap-test \ - tests/valgrind/hmapx-test \ - tests/valgrind/i18n-test \ - tests/valgrind/ll-test \ - tests/valgrind/llx-test \ - tests/valgrind/range-map-test \ - tests/valgrind/range-set-test \ - tests/valgrind/range-tower-test \ - tests/valgrind/sparse-array-test \ - tests/valgrind/sparse-xarray-test \ - tests/valgrind/str-test \ - tests/valgrind/string-map-test \ - tests/valgrind/stringi-map-test \ - tests/valgrind/string-set-test \ - tests/valgrind/stringi-set-test \ - tests/valgrind/tower-test \ - tests/valgrind/u8-istream-test \ - tests/valgrind/render-test \ - tests/valgrind/pspp-convert \ - tests/valgrind/pspp - -$(valgrind_wrappers): tests/valgrind-wrapper.in - @$(MKDIR_P) tests/valgrind - $(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \ - $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp - $(AM_V_at)chmod +x $@.tmp - $(AM_V_at)mv $@.tmp $@ -CLEANFILES += $(valgrind_wrappers) -EXTRA_DIST += tests/valgrind-wrapper.in -VALGRIND = $(SHELL) $(abs_top_builddir)/libtool --mode=execute valgrind --log-file=valgrind.%p --leak-check=full --num-callers=20 -check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) $(valgrind_wrappers) - XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS) +check-valgrind: + $(MAKE) check RUNNER='$(SHELL) $(abs_top_builddir)/libtool --mode=execute valgrind --log-file=valgrind.%p --leak-check=full --num-callers=20 --suppressions=$(abs_top_srcdir)/tests/valgrind.supp --read-inline-info=yes --read-var-info=yes' TESTSUITEFLAGS='$(TESTSUITEFLAGS) -d' @echo @echo '--------------------------------' @echo 'Valgrind output is in:' @echo 'tests/testsuite.dir/*/valgrind.*' @echo '--------------------------------' +EXTRA_DIST += tests/valgrind.supp tests/lsan.supp