X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=cb70fd3e8ec2f5ad645fde7b7a04dbb3e461a942;hb=e91782a2d25dec932c93b7a57bd03d836614ba43;hp=8897d9fbc292e4733bb768be6a7e93e5d1c6a20e;hpb=2485ec45d8a8a762cea1623fd46821e1a6d55630;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 8897d9fbc2..cb70fd3e8e 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -16,137 +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-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-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
 
+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-core.la gl/libgl.la
 
+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
 
+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
 
+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
 
+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
 
+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-core.la
 
+check_PROGRAMS += tests/libpspp/string-set-test
 tests_libpspp_string_set_test_SOURCES = \
 	src/libpspp/hash-functions.c \
 	src/libpspp/hmap.c \
@@ -154,24 +143,29 @@ 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-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
 
+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-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
 
+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
@@ -179,6 +173,7 @@ tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \
 	src/libpspp-core.la \
 	gl/libgl.la
 
+check_PROGRAMS += tests/data/inexactify
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
 check_PROGRAMS += tests/language/lexer/command-name-test
@@ -255,9 +250,33 @@ 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/libpspp-core.la src/output/liboutput.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_CFLAGS = $(AM_CFLAGS) -I $(top_srcdir)/src/output
+
 
 EXTRA_DIST += \
 	tests/coverage.sh \
+	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 \
@@ -300,6 +319,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 \
@@ -380,6 +400,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 \
@@ -424,6 +445,7 @@ TESTSUITE_AT = \
 	tests/output/paper-size.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 \
@@ -432,7 +454,7 @@ TESTSUITE_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