X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=c104ecca4774828371124ae443d3195cb5f88928;hb=refs%2Fbuilds%2F20131122030508%2Fpspp;hp=ade39f9e7b2e8c1f2dd67e125ee8fda78b13b802;hpb=4bc7fb8814bc15858ab801be55b3b6cd79dd06e6;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index ade39f9e7b..c104ecca47 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -14,6 +14,7 @@ check_PROGRAMS += \
 	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 \
@@ -43,6 +44,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
@@ -103,7 +107,7 @@ 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/libpspp.la gl/libgl.la
+tests_libpspp_range_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
 
 tests_libpspp_str_test_SOURCES = \
 	tests/libpspp/str-test.c
@@ -147,7 +151,9 @@ 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/liblibpspp.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
 
@@ -188,12 +194,13 @@ tests_language_lexer_segment_test_LDADD = \
 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/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 = \
@@ -234,6 +241,7 @@ 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 \
@@ -261,6 +269,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 \
@@ -289,6 +298,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 \
@@ -320,6 +330,7 @@ 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 \
@@ -358,7 +369,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:
@@ -424,7 +435,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:'