X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=7fd773cb206baed76dafa03a14ad864c46726c59;hb=a5d6129e0fa3ae298b5f71613509c68441b7d04b;hp=1a9ef8442120a5de7db357fc540b9320e63b155a;hpb=c2dbc834863c3088991bc2f6f6e32c595e7f1079;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 1a9ef84421..7fd773cb20 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -9,15 +9,18 @@ check_PROGRAMS += \
 	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 \
@@ -28,7 +31,9 @@ check_PROGRAMS += \
 	tests/libpspp/tower-test \
 	tests/libpspp/u8-istream-test \
 	tests/libpspp/zip-test \
-	tests/output/render-test
+	tests/output/render-test \
+	tests/ui/syntax-gen-test
+
 
 check-programs: $(check_PROGRAMS)
 
@@ -42,6 +47,9 @@ tests_data_sack_SOURCES = \
 tests_data_sack_LDADD = src/libpspp-core.la 
 tests_data_sack_CFLAGS = $(AM_CFLAGS)
 
+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_ll_test_SOURCES = \
 	src/libpspp/ll.c \
 	tests/libpspp/ll-test.c
@@ -55,12 +63,14 @@ tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_encoding_guesser_test_SOURCES = \
 	tests/libpspp/encoding-guesser-test.c
-tests_libpspp_encoding_guesser_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = \
+	src/libpspp/liblibpspp.la \
+	gl/libgl.la
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_heap_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_hmap_test_SOURCES = \
 	src/libpspp/hmap.c \
@@ -74,7 +84,7 @@ tests_libpspp_hmapx_test_SOURCES = \
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
-tests_libpspp_i18n_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
+tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 
 
 tests_libpspp_abt_test_SOURCES = \
 	src/libpspp/abt.c \
@@ -86,6 +96,11 @@ tests_libpspp_bt_test_SOURCES = \
 	tests/libpspp/bt-test.c
 tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+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
+
 tests_libpspp_range_map_test_SOURCES = \
 	src/libpspp/bt.c \
 	src/libpspp/range-map.c \
@@ -95,21 +110,26 @@ tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 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/libpspp.la gl/libgl.la
+tests_libpspp_range_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+
+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_str_test_SOURCES = \
 	tests/libpspp/str-test.c
-tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la 
+tests_libpspp_str_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la 
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_string_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_string_set_test_SOURCES = \
 	src/libpspp/hash-functions.c \
@@ -121,25 +141,27 @@ tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 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/libpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
-tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 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/libpspp.la gl/libgl.la
+tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/liblibpspp.la \
+	src/libpspp-core.la \
+	gl/libgl.la 
 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
@@ -149,7 +171,7 @@ tests_language_lexer_command_name_test_SOURCES = \
 	src/language/lexer/command-name.c \
 	tests/language/lexer/command-name-test.c
 tests_language_lexer_command_name_test_LDADD = \
-	src/libpspp/libpspp.la \
+	src/libpspp/liblibpspp.la \
 	gl/libgl.la 
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 
@@ -163,7 +185,7 @@ tests_language_lexer_scan_test_SOURCES = \
 	tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_scan_test_LDADD = \
-	src/libpspp/libpspp.la \
+	src/libpspp/liblibpspp.la \
 	gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test
@@ -174,18 +196,19 @@ tests_language_lexer_segment_test_SOURCES = \
 	tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
 tests_language_lexer_segment_test_LDADD = \
-	src/libpspp/libpspp.la \
+	src/libpspp/liblibpspp.la \
 	gl/libgl.la 
 
 check_PROGRAMS += tests/libpspp/zip-test
 tests_libpspp_zip_test_SOURCES = \
 	tests/libpspp/zip-test.c
+
 tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
 tests_libpspp_zip_test_LDADD = \
-	src/libpspp/libpspp.la \
+	src/libpspp/liblibpspp.la \
+	src/libpspp-core.la \
 	gl/libgl.la 
 
-
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
 tests_output_render_test_LDADD = \
@@ -193,23 +216,32 @@ tests_output_render_test_LDADD = \
 	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
+tests_ui_syntax_gen_test_LDADD = \
+	src/ui/libuicommon.la \
+	src/libpspp-core.la \
+	$(CAIRO_LIBS)
+
+
 EXTRA_DIST += \
 	tests/coverage.sh \
 	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/v13.sav \
 	tests/data/v14.sav \
-        tests/language/data-io/Book1.gnm.unzipped \
-        tests/language/data-io/test.ods
+	tests/language/data-io/Book1.gnm.unzipped \
+	tests/language/data-io/test.ods \
+	tests/language/data-io/newone.ods
 
 CLEANFILES += *.save pspp.* foo*
-
-EXTRA_DIST += tests/OChangeLog
 
 # Autotest testsuite
 
@@ -226,10 +258,12 @@ TESTSUITE_AT = \
 	tests/data/data-in.at \
 	tests/data/data-out.at \
 	tests/data/datasheet-test.at \
+	tests/data/dictionary.at \
 	tests/data/format-guesser.at \
 	tests/data/por-file.at \
 	tests/data/sys-file-reader.at \
 	tests/data/sys-file.at \
+	tests/data/sys-file-encryption.at \
 	tests/language/command.at \
 	tests/language/control/do-if.at \
 	tests/language/control/do-repeat.at \
@@ -253,6 +287,7 @@ TESTSUITE_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 \
@@ -281,6 +316,7 @@ TESTSUITE_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 \
@@ -297,6 +333,7 @@ TESTSUITE_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 \
@@ -311,10 +348,12 @@ TESTSUITE_AT = \
 	tests/libpspp/hmap.at \
 	tests/libpspp/hmapx.at \
 	tests/libpspp/i18n.at \
+	tests/libpspp/line-reader.at \
 	tests/libpspp/ll.at \
 	tests/libpspp/llx.at \
 	tests/libpspp/range-map.at \
 	tests/libpspp/range-set.at \
+	tests/libpspp/range-tower.at \
 	tests/libpspp/sparse-array.at \
 	tests/libpspp/sparse-xarray-test.at \
 	tests/libpspp/str.at \
@@ -333,11 +372,12 @@ TESTSUITE_AT = \
 	tests/output/paper-size.at \
 	tests/output/render.at \
 	tests/ui/terminal/main.at \
+	tests/ui/syntax-gen.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
+AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
 	cp $< $@
@@ -348,7 +388,7 @@ EXTRA_DIST += tests/testsuite.at
 
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE) $(check_PROGRAMS)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
+	XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean:
@@ -390,6 +430,7 @@ valgrind_wrappers = \
 	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 \
@@ -400,10 +441,11 @@ valgrind_wrappers = \
 	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
-	@test -d tests/valgrind || mkdir tests/valgrind
+	@$(MKDIR_P) tests/valgrind
 	sed -e 's,[@]wrap_program[@],$@,' \
 		$(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
 	chmod +x $@.tmp
@@ -413,7 +455,7 @@ 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)
-	$(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+	XTERM_LOCALE='' $(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
 	@echo
 	@echo '--------------------------------'
 	@echo 'Valgrind output is in:'