X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fautomake.mk;h=b8ab5d63fddae8525f27c98ee2dd2b2915d1cafe;hb=c725a4f64718ef1ee4139c27c94b2eb6447b51b4;hp=5e6e2369cd38b68100608fa3b70083e618d2e741;hpb=e1fb96f07a06f3133f54702ed8706493989789fe;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 5e6e2369..b8ab5d63 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -2,6 +2,10 @@
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
 TESTS_ENVIRONMENT += PERL='@PERL@'
+
+# Allow locale_charset to find charset.alias before running "make install".
+TESTS_ENVIRONMENT += CHARSETALIASDIR='$(abs_top_builddir)/gl'
+
 dist_TESTS = \
 	tests/command/aggregate.sh \
 	tests/command/autorecod.sh \
@@ -20,6 +24,9 @@ dist_TESTS = \
 	tests/command/file-handle.sh \
 	tests/command/filter.sh \
 	tests/command/flip.sh \
+	tests/command/get-data-txt.sh \
+	tests/command/get-data-txt-examples.sh \
+	tests/command/get-data-txt-importcases.sh \
 	tests/command/import-export.sh \
 	tests/command/input-program.sh \
 	tests/command/insert.sh \
@@ -79,6 +86,7 @@ dist_TESTS = \
 	tests/formats/time-out.sh \
 	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 \
@@ -107,12 +115,14 @@ dist_TESTS = \
 	tests/bugs/match-files-scratch.sh \
 	tests/bugs/multipass.sh \
 	tests/bugs/overwrite-input-file.sh \
+	tests/bugs/overwrite-special-file.sh \
 	tests/bugs/random.sh \
 	tests/bugs/signals.sh \
 	tests/bugs/t-test-with-temp.sh \
 	tests/bugs/t-test.sh \
 	tests/bugs/t-test-alpha.sh \
 	tests/bugs/t-test-alpha2.sh \
+	tests/bugs/t-test-alpha3.sh \
 	tests/bugs/temporary.sh \
 	tests/bugs/unwritable-dir.sh \
 	tests/bugs/val-labs.sh \
@@ -140,6 +150,10 @@ dist_TESTS = \
 	tests/expressions/variables.sh \
 	tests/expressions/vectors.sh
 
+if GNM_SUPPORT
+dist_TESTS += tests/command/get-data-gnm.sh 
+endif
+
 nodist_TESTS = \
 	tests/libpspp/abt-test \
 	tests/libpspp/bt-test \
@@ -149,6 +163,7 @@ nodist_TESTS = \
 	tests/libpspp/range-map-test \
 	tests/libpspp/range-set-test \
 	tests/libpspp/sparse-array-test \
+	tests/libpspp/str-test \
 	tests/libpspp/tower-test
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
@@ -161,6 +176,7 @@ 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_llx_test_SOURCES = \
 	src/libpspp/ll.c \
@@ -168,6 +184,7 @@ tests_libpspp_llx_test_SOURCES = \
 	src/libpspp/llx.c \
 	src/libpspp/llx.h \
 	tests/libpspp/llx-test.c
+tests_libpspp_llx_test_LDADD = gl/libgl.la @LIBINTL@
 
 tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/heap.c \
@@ -212,6 +229,10 @@ tests_libpspp_range_set_test_SOURCES = \
 tests_libpspp_range_set_test_LDADD = gl/libgl.la @LIBINTL@
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_str_test_SOURCES = \
+	tests/libpspp/str-test.c
+tests_libpspp_str_test_LDADD = src/libpspp/libpspp.a gl/libgl.la @LIBINTL@
+
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
 	src/libpspp/abt.h \
@@ -236,6 +257,7 @@ tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
 EXTRA_DIST += \
 	$(dist_TESTS) \
+        tests/Book1.gnm.unzipped \
 	tests/weighting.data tests/data-list.data tests/list.data \
 	tests/no_case_size.sav \
 	tests/coverage.sh tests/test_template \