X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=a95bf3e5c2e3ff21c7edcc2a7f7a01c7239d9b54;hb=d94dc663529b4e05ec1e7c47c1e73310abb1d3b4;hp=1e3b3a97d6a834ebce6e5031e12f300d63833ba6;hpb=85e74b3e36d5673205cb64345bca2587889f2113;p=pspp-builds.git

diff --git a/tests/automake.mk b/tests/automake.mk
index 1e3b3a97..a95bf3e5 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 TESTS_ENVIRONMENT = top_srcdir='$(top_srcdir)' top_builddir='$(top_builddir)'
-TESTS_ENVIRONMENT += PERL='@PERL@' PG_CONFIG='@PG_CONFIG@'
+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'
@@ -16,7 +16,7 @@ dist_TESTS = \
 	tests/command/beg-data.sh \
 	tests/command/bignum.sh \
 	tests/command/count.sh \
-	tests/command/datasheet.sh \
+	tests/command/correlation.sh \
 	tests/command/data-list.sh \
 	tests/command/do-if.sh \
 	tests/command/do-repeat.sh \
@@ -32,7 +32,6 @@ dist_TESTS = \
 	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 \
 	tests/command/lag.sh \
 	tests/command/line-ends.sh \
@@ -58,6 +57,8 @@ dist_TESTS = \
 	tests/command/regression.sh \
 	tests/command/regression-qr.sh \
 	tests/command/reliability.sh \
+	tests/command/roc.sh \
+	tests/command/roc2.sh \
 	tests/command/sample.sh \
 	tests/command/sort.sh \
 	tests/command/sysfiles.sh \
@@ -109,6 +110,7 @@ dist_TESTS = \
 	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 \
@@ -135,12 +137,14 @@ dist_TESTS = \
 	tests/bugs/overwrite-special-file.sh \
 	tests/bugs/piechart.sh \
 	tests/bugs/random.sh \
+	tests/bugs/shbang.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/t-test-paired.sh \
 	tests/bugs/temporary.sh \
 	tests/bugs/unwritable-dir.sh \
 	tests/bugs/val-labs.sh \
@@ -152,6 +156,8 @@ dist_TESTS = \
 	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 \
@@ -194,13 +200,27 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 check_PROGRAMS += \
 	$(nodist_TESTS) \
-	tests/formats/inexactify
+	tests/data/datasheet-test \
+	tests/formats/inexactify \
+	tests/libpspp/sparse-xarray-test
+
+tests_data_datasheet_test_SOURCES = \
+	tests/data/datasheet-test.c
+tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la $(LIBINTL) 
+tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
+
+# This seems to be necessary as the libtool artifacts aren't removed
+# Automake bug ?
+tests_data_datasheet_test_CLEAN:
+	rm -fr tests/data
+
+CLEAN_LOCAL += tests_data_datasheet_test_CLEAN
 
 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_ll_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_ll_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_llx_test_SOURCES = \
@@ -209,7 +229,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_llx_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_llx_test_CFLAGS = $(AM_CFLAGS)
 
 tests_libpspp_heap_test_SOURCES = \
@@ -218,14 +238,14 @@ tests_libpspp_heap_test_SOURCES = \
 	src/libpspp/pool.c \
 	src/libpspp/pool.h \
 	tests/libpspp/heap-test.c
-tests_libpspp_heap_test_LDADD = gl/libgl.la @LIBINTL@ 
+tests_libpspp_heap_test_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_hmap_test_SOURCES = \
 	src/libpspp/hmap.c \
 	src/libpspp/hmap.h \
 	tests/libpspp/hmap-test.c
-tests_libpspp_hmap_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_hmap_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_hmap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_hmapx_test_SOURCES = \
@@ -234,14 +254,14 @@ tests_libpspp_hmapx_test_SOURCES = \
 	src/libpspp/hmapx.c \
 	src/libpspp/hmapx.h \
 	tests/libpspp/hmapx-test.c
-tests_libpspp_hmapx_test_LDADD = gl/libgl.la @LIBINTL@
+tests_libpspp_hmapx_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 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 @LIBINTL@
+tests_libpspp_abt_test_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_abt_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_bt_test_SOURCES = \
@@ -257,7 +277,7 @@ tests_libpspp_range_map_test_SOURCES = \
 	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_LDADD = gl/libgl.la $(LIBINTL)
 tests_libpspp_range_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_range_set_test_SOURCES = \
@@ -268,12 +288,12 @@ tests_libpspp_range_set_test_SOURCES = \
 	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_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.la gl/libgl.la @LIBINTL@ 
+tests_libpspp_str_test_LDADD = src/libpspp/libpspp.la gl/libgl.la $(LIBINTL) 
 
 tests_libpspp_tower_test_SOURCES = \
 	src/libpspp/abt.c \
@@ -283,7 +303,7 @@ tests_libpspp_tower_test_SOURCES = \
 	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_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
 tests_libpspp_sparse_array_test_SOURCES = \
@@ -292,9 +312,24 @@ tests_libpspp_sparse_array_test_SOURCES = \
 	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_LDADD = gl/libgl.la $(LIBINTL) 
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
 
+tests_libpspp_sparse_xarray_test_SOURCES = \
+	src/libpspp/argv-parser.c \
+	src/libpspp/bt.c \
+	src/libpspp/deque.c \
+	src/libpspp/model-checker.c \
+	src/libpspp/range-set.c \
+	src/libpspp/sparse-array.c \
+	src/libpspp/sparse-xarray.c \
+	src/libpspp/str.c \
+	src/libpspp/pool.c \
+	src/libpspp/tmpfile.c \
+	tests/libpspp/sparse-xarray-test.c
+tests_libpspp_sparse_xarray_test_LDADD = gl/libgl.la $(LIBINTL) 
+tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+
 tests_formats_inexactify_SOURCES = tests/formats/inexactify.c
 
 noinst_PROGRAMS += tests/dissect-sysfile
@@ -302,7 +337,7 @@ 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@ 
+tests_dissect_sysfile_LDADD = gl/libgl.la $(LIBINTL) 
 tests_dissect_sysfile_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
 EXTRA_DIST += \