From c3fc1e299a9ca00c6328735301fe47408c625fd2 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 2 Aug 2020 22:10:42 +0000 Subject: [PATCH] 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. --- tests/automake.mk | 2 +- tests/math/chart-geometry.at | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/automake.mk b/tests/automake.mk index 8897d9fbc2..c5f01b16bd 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -432,7 +432,7 @@ TESTSUITE_AT = \ 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 diff --git a/tests/math/chart-geometry.at b/tests/math/chart-geometry.at index eebc065485..c14d89e92d 100644 --- 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_CHECK([../../math/chart-get-scale-test], [0], [ignore]) +AT_CHECK([chart-get-scale-test], [0], [ignore]) 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 -- 2.30.2