more work on datasets

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index be44b342e9267ccc2f491457f960b308f1383a4d..561f23bfcefabfb38f56a536134b06c9d7a135c2 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -31,9 +31,8 @@ check_PROGRAMS += \
        tests/libpspp/tower-test \
        tests/libpspp/u8-istream-test \
        tests/libpspp/zip-test \
-       tests/math/chart-geometry-test \
+       tests/math/chart-get-ticks-format-test \
        tests/math/chart-get-scale-test \
-       tests/math/decimal-test \
        tests/output/render-test \
        tests/ui/syntax-gen-test
 
@@ -212,14 +211,6 @@ tests_libpspp_zip_test_LDADD = \
        src/libpspp-core.la \
        gl/libgl.la 
 
-check_PROGRAMS += tests/math/chart-geometry-test
-tests_math_chart_geometry_test_SOURCES = tests/math/chart-geometry-test.c
-tests_math_chart_geometry_test_LDADD = \
-       src/math/libpspp-math.la \
-       src/libpspp/liblibpspp.la \
-       src/libpspp-core.la \
-       gl/libgl.la 
-
 check_PROGRAMS += tests/math/chart-get-scale-test
 tests_math_chart_get_scale_test_SOURCES = tests/math/chart-get-scale-test.c
 tests_math_chart_get_scale_test_LDADD = \
@@ -236,15 +227,6 @@ tests_math_chart_get_ticks_format_test_LDADD = \
        src/libpspp-core.la \
        gl/libgl.la
 
-check_PROGRAMS += tests/math/decimal-test
-tests_math_decimal_test_SOURCES = tests/math/decimal-test.c
-tests_math_decimal_test_LDADD = \
-       src/math/libpspp-math.la \
-       src/libpspp/liblibpspp.la \
-       src/libpspp-core.la \
-       gl/libgl.la 
-
-
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
 tests_output_render_test_LDADD = \
@@ -273,6 +255,7 @@ EXTRA_DIST += \
        tests/data/num-out.expected.cmp.gz \
        tests/data/v13.sav \
        tests/data/v14.sav \
+       tests/data/test-encrypted.sps \
        tests/language/data-io/Book1.gnm.unzipped \
        tests/language/data-io/test.ods \
        tests/language/data-io/newone.ods \
@@ -296,12 +279,13 @@ TESTSUITE_AT = \
        tests/data/data-out.at \
        tests/data/datasheet-test.at \
        tests/data/dictionary.at \
+       tests/data/file.at \
        tests/data/format-guesser.at \
        tests/data/pc+-file-reader.at \
        tests/data/por-file.at \
        tests/data/sys-file-reader.at \
        tests/data/sys-file.at \
-       tests/data/sys-file-encryption.at \
+       tests/data/encrypted-file.at \
        tests/language/command.at \
        tests/language/control/do-if.at \
        tests/language/control/do-repeat.at \
@@ -404,7 +388,6 @@ TESTSUITE_AT = \
        tests/libpspp/u8-istream.at \
        tests/libpspp/zip.at \
        tests/math/chart-geometry.at \
-       tests/math/decimal.at \
        tests/math/moments.at \
        tests/math/randist.at \
        tests/output/ascii.at \
@@ -439,7 +422,7 @@ tests_clean:
 AUTOM4TE = $(SHELL) $(srcdir)/build-aux/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(srcdir)/tests/testsuite.at $(TESTSUITE_AT) 
-       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | sed 's/@<00A0>@/ /g' > $@.tmp
+       $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' $@.at | $(SED) 's/@<00A0>@/ /g' > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
@@ -488,7 +471,7 @@ valgrind_wrappers = \
 
 $(valgrind_wrappers): tests/valgrind-wrapper.in
        @$(MKDIR_P) tests/valgrind
-       $(AM_V_GEN)sed -e 's,[@]wrap_program[@],$@,' \
+       $(AM_V_GEN)$(SED) -e 's,[@]wrap_program[@],$@,' \
                $(top_srcdir)/tests/valgrind-wrapper.in > $@.tmp
        $(AM_V_at)chmod +x $@.tmp
        $(AM_V_at)mv $@.tmp $@