tests: Use AUTOTEST_PATH to find chart test programs.

Otherwise the test wrappers feature can't help to find it on mingw, so
the chart geometry tests fail.

diff --git a/tests/automake.mk b/tests/automake.mk
index 8897d9fbc292e4733bb768be6a7e93e5d1c6a20e..c5f01b16bdc97a4be7b08cfb691160042b88a13a 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -432,7 +432,7 @@ TESTSUITE_AT = \
 
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal
 
 TESTSUITE = $(srcdir)/tests/testsuite
 DISTCLEANFILES += tests/atconfig tests/atlocal

-AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:src/ui/terminal:utilities
+AUTOTEST_PATH = tests/data:tests/language/lexer:tests/libpspp:tests/output:tests/math:src/ui/terminal:utilities

 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
        $(AM_V_GEN)printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n' > $@,tmp
 
 $(srcdir)/tests/testsuite.at: tests/testsuite.in tests/automake.mk
        $(AM_V_GEN)printf '\043 Generated automatically -- do not modify!    -*- buffer-read-only: t -*-\n' > $@,tmp

diff --git a/tests/math/chart-geometry.at b/tests/math/chart-geometry.at
index eebc0654851b06d0d686633d8a11b1d0170a8762..c14d89e92d68930d975aea465486359181d32f69 100644 (file)
--- a/tests/math/chart-geometry.at
+++ b/tests/math/chart-geometry.at
@@ -17,11 +17,11 @@ dnl
 AT_BANNER([Chart Geometry])
 
 AT_SETUP([Chart Scale])
 AT_BANNER([Chart Geometry])
 
 AT_SETUP([Chart Scale])

-AT_CHECK([../../math/chart-get-scale-test], [0], [ignore])
+AT_CHECK([chart-get-scale-test], [0], [ignore])

 AT_CLEANUP
 
 AT_SETUP([Chart Ticks Format])
 AT_CLEANUP
 
 AT_SETUP([Chart Ticks Format])

-AT_CHECK([../../math/chart-get-ticks-format-test], [0], [dnl
+AT_CHECK([chart-get-ticks-format-test], [0], [dnl

 lower: 1000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 1030, ex 2: 1040
 lower: 10000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 10030, ex 2: 10040
 lower: 100000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 100030, ex 2: 100040
 lower: 1000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 1030, ex 2: 1040
 lower: 10000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 10030, ex 2: 10040
 lower: 100000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 100030, ex 2: 100040