X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=561f23bfcefabfb38f56a536134b06c9d7a135c2;hb=43f0e5bf6c53ee0ba31b259aab230861baa4eb7e;hp=31a7877d0743056548d5ff2552fac448778a206c;hpb=3a21788dd4f7a4f10d12a12e83c8890f857b5e98;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 31a7877d07..561f23bfce 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -31,6 +31,8 @@ check_PROGRAMS += \
 	tests/libpspp/tower-test \
 	tests/libpspp/u8-istream-test \
 	tests/libpspp/zip-test \
+	tests/math/chart-get-ticks-format-test \
+	tests/math/chart-get-scale-test \
 	tests/output/render-test \
 	tests/ui/syntax-gen-test
 
@@ -209,6 +211,22 @@ tests_libpspp_zip_test_LDADD = \
 	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 = \
+	src/math/libpspp-math.la \
+	src/libpspp/liblibpspp.la \
+	src/libpspp-core.la \
+	gl/libgl.la
+
+check_PROGRAMS += tests/math/chart-get-ticks-format-test
+tests_math_chart_get_ticks_format_test_SOURCES = tests/math/chart-get-ticks-format-test.c
+tests_math_chart_get_ticks_format_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 = \
@@ -237,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 \
@@ -260,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 \
@@ -367,6 +387,7 @@ TESTSUITE_AT = \
 	tests/libpspp/tower.at \
 	tests/libpspp/u8-istream.at \
 	tests/libpspp/zip.at \
+	tests/math/chart-geometry.at \
 	tests/math/moments.at \
 	tests/math/randist.at \
 	tests/output/ascii.at \
@@ -401,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.
@@ -450,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 $@