X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=75989222877dc4fad79666c3c6548271392ff02e;hb=430f3a7cd6d9175a54a9e97fb91d5fc912fcfea4;hp=25eb1ab9ce8c7f3ff31a0ad7b908a2cf891dc7be;hpb=24d4c143974d0cf3258fe2d355695e820c4ff24e;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 25eb1ab9..75989222 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,7 +1,11 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='@PERL@'
+TESTS_ENVIRONMENT += PERL='@PERL@' PG_CONFIG='@PG_CONFIG@'
+
+# 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 \
@@ -69,6 +76,7 @@ dist_TESTS = \
 	tests/formats/date-in.sh \
 	tests/formats/date-out.sh \
 	tests/formats/float-format.sh \
+	tests/formats/format-guesser.sh \
 	tests/formats/ib-in.sh \
 	tests/formats/legacy-in.sh \
 	tests/formats/month-in.sh \
@@ -79,6 +87,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 \
@@ -97,6 +106,7 @@ dist_TESTS = \
 	tests/bugs/get.sh \
 	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 \
@@ -106,12 +116,15 @@ dist_TESTS = \
 	tests/bugs/list-overflow.sh \
 	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 \
@@ -139,6 +152,14 @@ dist_TESTS = \
 	tests/expressions/variables.sh \
 	tests/expressions/vectors.sh
 
+if GNM_SUPPORT
+dist_TESTS += tests/command/get-data-gnm.sh 
+endif
+
+if PSQL_SUPPORT
+dist_TESTS += tests/command/get-data-psql.sh 
+endif
+
 nodist_TESTS = \
 	tests/libpspp/abt-test \
 	tests/libpspp/bt-test \
@@ -148,6 +169,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)
@@ -160,6 +182,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 \
@@ -167,6 +190,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 \
@@ -211,6 +235,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 \
@@ -233,8 +261,16 @@ tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
+noinst_PROGRAMS += tests/dissect-sysfile
+tests_dissect_sysfile_SOURCES = \
+	src/libpspp/integer-format.c \
+	src/libpspp/float-format.c \
+	tests/dissect-sysfile.c
+tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@
+
 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 \