X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=a342e5491460c425befc45682bc86b6b6f95263c;hb=c5ad65b0351ab1d897eb072eeaec06fb37802b01;hp=dcfbf2335df87f99560823510504d3f20b9a0e71;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index dcfbf2335d..a342e54914 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -10,9 +10,7 @@ TESTS_ENVIRONMENT += LC_ALL=C
 
 dist_TESTS = \
 	tests/command/add-files.sh \
-	tests/command/aggregate.sh \
 	tests/command/attributes.sh \
-	tests/command/autorecod.sh \
 	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
 	tests/command/count.sh \
@@ -100,22 +98,13 @@ dist_TESTS = \
 	tests/formats/wkday-in.sh \
 	tests/formats/wkday-out.sh \
 	tests/formats/360.sh \
-	tests/bugs/agg_crash.sh \
-	tests/bugs/agg-crash-2.sh \
-	tests/bugs/alpha-freq.sh \
 	tests/bugs/big-input.sh \
 	tests/bugs/big-input-2.sh \
 	tests/bugs/case-map.sh \
 	tests/bugs/comment-at-eof.sh \
-	tests/bugs/compute-fmt.sh \
 	tests/bugs/compression.sh \
-	tests/bugs/crosstabs.sh \
-	tests/bugs/crosstabs2.sh \
-	tests/bugs/crosstabs-crash.sh \
-	tests/bugs/crosstabs-crash2.sh \
 	tests/bugs/curtailed.sh \
 	tests/bugs/data-crash.sh \
-	tests/bugs/double-frequency.sh \
 	tests/bugs/empty-do-repeat.sh \
 	tests/bugs/get.sh \
 	tests/bugs/examine-crash.sh \
@@ -124,9 +113,7 @@ dist_TESTS = \
 	tests/bugs/examine-1sample.sh \
 	tests/bugs/examine-missing.sh \
 	tests/bugs/examine-missing2.sh \
-	tests/bugs/freq-nolabels.sh \
 	tests/bugs/get-no-file.sh \
-	tests/bugs/html-frequency.sh \
 	tests/bugs/if_crash.sh \
 	tests/bugs/input-crash.sh \
 	tests/bugs/lag_crash.sh \
@@ -135,7 +122,6 @@ dist_TESTS = \
 	tests/bugs/multipass.sh \
 	tests/bugs/overwrite-input-file.sh \
 	tests/bugs/overwrite-special-file.sh \
-	tests/bugs/piechart.sh \
 	tests/bugs/random.sh \
 	tests/bugs/shbang.sh \
 	tests/bugs/signals.sh \
@@ -149,24 +135,12 @@ dist_TESTS = \
 	tests/bugs/unwritable-dir.sh \
 	tests/bugs/val-labs.sh \
 	tests/bugs/val-labs-trailing-slash.sh \
-	tests/bugs/recode-copy-bug.sh \
-	tests/bugs/computebug.sh \
-	tests/bugs/compute-lv.sh \
-	tests/bugs/compute-sum.sh \
-	tests/bugs/temp-freq.sh \
 	tests/bugs/print-crash.sh \
 	tests/bugs/keep-all.sh \
 	tests/data/datasheet-test.sh \
 	tests/libpspp/sparse-xarray-test.sh \
 	tests/output/paper-size.sh \
-	tests/xforms/recode.sh \
-	tests/stats/descript-basic.sh \
-	tests/stats/descript-missing.sh \
-	tests/stats/descript-mean-bug.sh \
 	tests/stats/moments.sh \
-	tests/stats/percentiles-compatible.sh \
-	tests/stats/ntiles.sh \
-	tests/stats/percentiles-enhanced.sh \
 	tests/expressions/expressions.sh \
 	tests/expressions/epoch.sh \
 	tests/expressions/randist.sh \
@@ -195,7 +169,9 @@ nodist_TESTS = \
 	tests/libpspp/sparse-array-test \
 	tests/libpspp/str-test \
 	tests/libpspp/string-map-test \
+	tests/libpspp/stringi-map-test \
 	tests/libpspp/string-set-test \
+	tests/libpspp/stringi-set-test \
 	tests/libpspp/tower-test
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -300,6 +276,18 @@ tests_libpspp_string_map_test_SOURCES = \
 tests_libpspp_string_map_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_stringi_map_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/pool.c \
+	src/libpspp/str.c \
+	src/libpspp/stringi-map.c \
+	src/libpspp/string-set.c \
+	src/libpspp/stringi-set.c \
+	tests/libpspp/stringi-map-test.c
+tests_libpspp_stringi_map_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_string_set_test_SOURCES = \
 	src/libpspp/hash-functions.c \
 	src/libpspp/hmap.c \
@@ -308,6 +296,16 @@ tests_libpspp_string_set_test_SOURCES = \
 tests_libpspp_string_set_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_string_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_stringi_set_test_SOURCES = \
+	src/libpspp/hash-functions.c \
+	src/libpspp/hmap.c \
+	src/libpspp/pool.c \
+	src/libpspp/str.c \
+	src/libpspp/stringi-set.c \
+	tests/libpspp/stringi-set-test.c
+tests_libpspp_stringi_set_test_LDADD = gl/libgl.la $(LIBINTL)
+tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
@@ -419,13 +417,22 @@ EXTRA_DIST += \
 	$(TESTSUITE)
 TESTSUITE_AT = \
 	tests/testsuite.at \
-	tests/output/render.at
+	tests/language/dictionary/mrsets.at \
+	tests/language/stats/aggregate.at \
+	tests/language/stats/autorecode.at \
+	tests/language/stats/crosstabs.at \
+	tests/language/stats/descriptives.at \
+	tests/language/stats/frequencies.at \
+	tests/language/xforms/compute.at \
+	tests/language/xforms/recode.at \
+	tests/output/render.at \
+	tests/perl-module.at
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal $(TESTSUITE)
 
 CHECK_LOCAL += tests_check
 tests_check: tests/atconfig tests/atlocal $(TESTSUITE)
-	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output $(TESTSUITEFLAGS)
+	$(SHELL) '$(TESTSUITE)' -C tests AUTOTEST_PATH=tests/output:src/ui/terminal $(TESTSUITEFLAGS)
 
 CLEAN_LOCAL += tests_clean
 tests_clean: