X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fautomake.mk;h=72bb16796e8d05a7f2afb08c2ce1ab28f1d4c76d;hb=43d294198349061b9df3fa21d538a4cc7360fad1;hp=4cb4283e9d69b9bc38e45c2d7c4def754e769f21;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/tests/automake.mk b/tests/automake.mk
index 4cb4283e9d..72bb16796e 100644
--- 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,31 +211,21 @@ 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 = \
 	src/math/libpspp-math.la \
 	src/libpspp/liblibpspp.la \
 	src/libpspp-core.la \
-	gl/libgl.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 = \
+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 
-
+	gl/libgl.la
 
 check_PROGRAMS += tests/output/render-test
 tests_output_render_test_SOURCES = tests/output/render-test.c
@@ -266,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 \
@@ -289,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 \
@@ -397,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 \