X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=0b7fcb249a68ce1a7f66ff77279ab41e5c8a8aa9;hb=763b593a5b5773859e3cf739b843cf0bae0359e5;hp=639af7e14a0dc2a4ba5dc727089a0f282f266375;hpb=94ab41f950adbdbd353c376851f3198abc9736fa;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 639af7e1..0b7fcb24 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -5,8 +5,11 @@ check_PROGRAMS += \
 	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/encoding-guesser-test \
 	tests/libpspp/heap-test \
 	tests/libpspp/hmap-test \
 	tests/libpspp/hmapx-test \
@@ -23,6 +26,7 @@ check_PROGRAMS += \
 	tests/libpspp/string-set-test \
 	tests/libpspp/stringi-set-test \
 	tests/libpspp/tower-test \
+	tests/libpspp/u8-istream-test \
 	tests/output/render-test
 
 check-programs: $(check_PROGRAMS)
@@ -50,6 +54,10 @@ tests_libpspp_llx_test_SOURCES = \
 tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL)
 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_heap_test_SOURCES = \
 	src/libpspp/heap.c \
 	src/libpspp/pool.c \
@@ -156,6 +164,9 @@ tests_libpspp_tower_test_SOURCES = \
 tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+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_sparse_array_test_SOURCES = \
 	src/libpspp/sparse-array.c \
 	src/libpspp/pool.c \
@@ -201,6 +212,34 @@ tests_language_lexer_command_name_test_LDADD = \
 	$(LIBINTL) 
 tests_language_lexer_command_name_test_CFLAGS = $(AM_CFLAGS)
 
+check_PROGRAMS += tests/language/lexer/scan-test
+tests_language_lexer_scan_test_SOURCES = \
+	src/data/identifier.c \
+	src/language/lexer/command-name.c \
+	src/language/lexer/scan.c \
+	src/language/lexer/segment.c \
+	src/language/lexer/token.c \
+	src/libpspp/pool.c \
+	src/libpspp/prompt.c \
+	src/libpspp/str.c \
+	src/libpspp/temp-file.c \
+	tests/language/lexer/scan-test.c
+tests_language_lexer_scan_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
+
+check_PROGRAMS += tests/language/lexer/segment-test
+tests_language_lexer_segment_test_SOURCES = \
+	src/data/identifier.c \
+	src/language/lexer/command-name.c \
+	src/language/lexer/segment.c \
+	src/libpspp/pool.c \
+	src/libpspp/prompt.c \
+	src/libpspp/str.c \
+	src/libpspp/temp-file.c \
+	tests/language/lexer/segment-test.c
+tests_language_lexer_segment_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
+
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
 tests_output_render_test_LDADD = \
@@ -282,6 +321,8 @@ TESTSUITE_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 \
@@ -313,6 +354,7 @@ TESTSUITE_AT = \
 	tests/language/xforms/select-if.at \
 	tests/libpspp/abt.at \
 	tests/libpspp/bt.at \
+	tests/libpspp/encoding-guesser.at \
 	tests/libpspp/float-format.at \
 	tests/libpspp/heap.at \
 	tests/libpspp/hmap.at \
@@ -330,6 +372,7 @@ TESTSUITE_AT = \
 	tests/libpspp/string-set.at \
 	tests/libpspp/stringi-set.at \
 	tests/libpspp/tower.at \
+	tests/libpspp/u8-istream.at \
 	tests/math/moments.at \
 	tests/math/randist.at \
 	tests/output/charts.at \
@@ -341,6 +384,7 @@ TESTSUITE_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
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
 	cp $< $@
@@ -351,7 +395,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=tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=$(AUTOTEST_PATH) $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean:
@@ -374,3 +418,51 @@ $(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/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
+
+$(valgrind_wrappers): tests/valgrind-wrapper.in
+	@test -d tests/valgrind || mkdir tests/valgrind
+	sed -e 's,[@]wrap_program[@],$@,' \
+		$(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
+	chmod +x $@.tmp
+	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)
+	$(SHELL) '$(TESTSUITE)' -C tests VALGRIND='$(VALGRIND)' AUTOTEST_PATH='tests/valgrind:$(AUTOTEST_PATH)' -d $(TESTSUITEFLAGS)
+	@echo
+	@echo '--------------------------------'
+	@echo 'Valgrind output is in:'
+	@echo 'tests/testsuite.dir/*/valgrind.*'
+	@echo '--------------------------------'