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

diff --git a/tests/automake.mk b/tests/automake.mk
index 5e6e2369..409c6bf9 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 \
@@ -79,6 +83,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,6 +112,7 @@ 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 \
@@ -140,6 +146,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 \
@@ -161,6 +171,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 +179,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 \
@@ -236,6 +248,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 \