X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=3ec278c6ff0c55497277ed8894441d8c94d938ef;hb=refs%2Fbuilds%2F20130506010507%2Fpspp;hp=59d1977b95e2d4aa52be9518a60e61b81b5fb99b;hpb=58fe146604dfb8522c251aefbd9616779ae6cb46;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 59d1977b95..3ec278c6ff 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -14,10 +14,12 @@ 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 \
 	tests/libpspp/range-set-test \
+	tests/libpspp/range-tower-test \
 	tests/libpspp/sparse-array-test \
 	tests/libpspp/sparse-xarray-test \
 	tests/libpspp/str-test \
@@ -42,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
@@ -99,6 +104,11 @@ tests_libpspp_range_set_test_SOURCES = \
 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_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/liblibpspp.la gl/libgl.la 
@@ -228,6 +238,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 \
@@ -283,6 +294,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 \
@@ -314,10 +326,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 \
@@ -351,7 +365,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:
@@ -393,6 +407,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 \