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=3fb24f6e6db7a7a71a446bae4a93217c71f1d7b6;hpb=568b928e53608b633dcb5bb001bf1751446b1e77;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 3fb24f6e..409c6bf9 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -2,13 +2,19 @@
 
 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 \
 	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
 	tests/command/count.sh \
+	tests/command/datasheet.sh \
 	tests/command/data-list.sh \
+	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
 	tests/command/erase.sh \
 	tests/command/examine.sh \
@@ -19,6 +25,8 @@ dist_TESTS = \
 	tests/command/filter.sh \
 	tests/command/flip.sh \
 	tests/command/import-export.sh \
+	tests/command/input-program.sh \
+	tests/command/insert.sh \
 	tests/command/lag.sh \
 	tests/command/list.sh \
 	tests/command/loop.sh \
@@ -75,11 +83,13 @@ 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 \
 	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 \
@@ -101,6 +111,8 @@ 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 \
@@ -108,6 +120,7 @@ dist_TESTS = \
 	tests/bugs/t-test-alpha.sh \
 	tests/bugs/t-test-alpha2.sh \
 	tests/bugs/temporary.sh \
+	tests/bugs/unwritable-dir.sh \
 	tests/bugs/val-labs.sh \
 	tests/bugs/val-labs-trailing-slash.sh \
 	tests/bugs/recode-copy-bug.sh \
@@ -117,7 +130,8 @@ dist_TESTS = \
 	tests/bugs/temp-freq.sh \
 	tests/bugs/print-crash.sh \
 	tests/bugs/keep-all.sh \
-	tests/xforms/casefile.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 \
@@ -132,25 +146,32 @@ 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 \
+	tests/libpspp/heap-test \
 	tests/libpspp/ll-test \
 	tests/libpspp/llx-test \
-	tests/libpspp/heap-test \
-	tests/libpspp/abt-test
+	tests/libpspp/range-map-test \
+	tests/libpspp/range-set-test \
+	tests/libpspp/sparse-array-test \
+	tests/libpspp/tower-test
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
-	tests/libpspp/ll-test \
-	tests/libpspp/llx-test \
-	tests/formats/inexactify \
-	tests/libpspp/heap-test \
-	tests/libpspp/abt-test
+	$(nodist_TESTS) \
+	tests/formats/inexactify
 
 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 \
@@ -158,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 \
@@ -172,13 +194,61 @@ 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
+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 \
+	tests/libpspp/range-set-test.c
+tests_libpspp_range_set_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_range_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/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
+tests_libpspp_sparse_array_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 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 \