X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=83bbeeb343f683e517f426803b7dcdab5e9aa1c3;hb=4973832baa72e5848915b49579d28de6b52bfdaf;hp=abf61d15b072f86a89e1fed9b41029b667ba2e3a;hpb=b7a1f18b5206b1083038779158025e2ab36c2ef9;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index abf61d15b0..83bbeeb343 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,13 +10,8 @@ TESTS_ENVIRONMENT += LC_ALL=C
 TESTS_ENVIRONMENT += EXEEXT=$(EXEEXT)
 
 dist_TESTS = \
-	tests/command/add-files.sh \
-	tests/command/attributes.sh \
-	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
-	tests/command/count.sh \
 	tests/command/correlation.sh \
-	tests/command/data-list.sh \
 	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
 	tests/command/erase.sh \
@@ -174,6 +169,7 @@ check_PROGRAMS += \
 	$(nodist_TESTS) \
 	tests/data/datasheet-test \
 	tests/formats/inexactify \
+	tests/libpspp/i18n-test \
 	tests/libpspp/sparse-xarray-test \
 	tests/output/render-test
 
@@ -184,25 +180,20 @@ tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_ll_test_SOURCES = \
 	src/libpspp/ll.c \
-	src/libpspp/ll.h \
 	tests/libpspp/ll-test.c
 tests_libpspp_ll_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_llx_test_SOURCES = \
 	src/libpspp/ll.c \
-	src/libpspp/ll.h \
 	src/libpspp/llx.c \
-	src/libpspp/llx.h \
 	tests/libpspp/llx-test.c
 tests_libpspp_llx_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.c \
-	src/libpspp/heap.h \
 	src/libpspp/pool.c \
-	src/libpspp/pool.h \
 	src/libpspp/temp-file.c \
 	tests/libpspp/heap-test.c
 tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) 
@@ -210,50 +201,43 @@ tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_hmap_test_SOURCES = \
 	src/libpspp/hmap.c \
-	src/libpspp/hmap.h \
 	tests/libpspp/hmap-test.c
 tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_hmapx_test_SOURCES = \
 	src/libpspp/hmap.c \
-	src/libpspp/hmap.h \
 	src/libpspp/hmapx.c \
-	src/libpspp/hmapx.h \
 	tests/libpspp/hmapx-test.c
 tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL)
 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 $(LIBINTL) 
+
 tests_libpspp_abt_test_SOURCES = \
 	src/libpspp/abt.c \
-	src/libpspp/abt.h \
 	tests/libpspp/abt-test.c
 tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_bt_test_SOURCES = \
 	src/libpspp/bt.c \
-	src/libpspp/bt.h \
 	tests/libpspp/bt-test.c
 tests_libpspp_bt_test_LDADD = gl/libgl.la
 tests_libpspp_bt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_map_test_SOURCES = \
 	src/libpspp/bt.c \
-	src/libpspp/bt.h \
 	src/libpspp/range-map.c \
-	src/libpspp/range-map.h \
 	tests/libpspp/range-map-test.c
 tests_libpspp_range_map_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_set_test_SOURCES = \
 	src/libpspp/bt.c \
-	src/libpspp/bt.h \
 	src/libpspp/pool.c \
-	src/libpspp/pool.h \
 	src/libpspp/range-set.c \
-	src/libpspp/range-set.h \
 	src/libpspp/temp-file.c \
 	tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_LDADD = gl/libgl.la $(LIBINTL) 
@@ -306,21 +290,16 @@ tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
-	src/libpspp/abt.h \
 	src/libpspp/pool.c \
-	src/libpspp/pool.h \
 	src/libpspp/temp-file.c \
 	src/libpspp/tower.c \
-	src/libpspp/tower.h \
 	tests/libpspp/tower-test.c
 tests_libpspp_tower_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_array_test_SOURCES = \
 	src/libpspp/sparse-array.c \
-	src/libpspp/sparse-array.h \
 	src/libpspp/pool.c \
-	src/libpspp/pool.h \
 	tests/libpspp/sparse-array-test.c \
 	src/libpspp/temp-file.c
 tests_libpspp_sparse_array_test_LDADD = gl/libgl.la $(LIBINTL) 
@@ -419,6 +398,12 @@ EXTRA_DIST += \
 
 TESTSUITE_AT = \
 	tests/data/calendar.at \
+	tests/language/data-io/add-files.at \
+	tests/language/data-io/data-list.at \
+	tests/language/data-io/data-reader.at \
+	tests/language/data-io/save.at \
+	tests/language/data-io/save-translate.at \
+	tests/language/dictionary/attributes.at \
 	tests/language/dictionary/mrsets.at \
 	tests/language/expressions/evaluate.at \
 	tests/language/stats/aggregate.at \
@@ -429,8 +414,11 @@ TESTSUITE_AT = \
 	tests/language/stats/flip.at \
 	tests/language/stats/frequencies.at \
 	tests/language/stats/oneway.at \
+	tests/language/utilities/set.at \
 	tests/language/xforms/compute.at \
+	tests/language/xforms/count.at \
 	tests/language/xforms/recode.at \
+	tests/libpspp/i18n.at \
 	tests/math/moments.at \
 	tests/output/render.at \
 	tests/output/charts.at \
@@ -448,7 +436,7 @@ $(srcdir)/tests/testsuite.at: tests/testsuite.in Makefile
 
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/libpspp:tests/output:src/ui/terminal $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean: