X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmath%2Fchart-geometry.at;h=91f74872a6bf9f53b320971398c8c3ee4ce265c6;hb=92beabc20b287841f195cfa3576d031c655df490;hp=5b0b6d3e44e3a20b1548d1669a259d37ad51ebe8;hpb=691a034d7f2139076fa012739dffd40ef5db4a9b;p=pspp

diff --git a/tests/math/chart-geometry.at b/tests/math/chart-geometry.at
index 5b0b6d3e44..91f74872a6 100644
--- a/tests/math/chart-geometry.at
+++ b/tests/math/chart-geometry.at
@@ -1,26 +1,29 @@
 dnl PSPP - a program for statistical analysis.
 dnl Copyright (C) 2017 Free Software Foundation, Inc.
-dnl 
+dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
 dnl the Free Software Foundation, either version 3 of the License, or
 dnl (at your option) any later version.
-dnl 
+dnl
 dnl This program is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
-dnl 
+dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl AT_BANNER([Chart Geometry])
+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
+# The 'sed' below converts, e.g. 1.5e-005 into 1.5e-05, to make the output
+# format uniform for comparison.  (mingw always outputs 3-digit exponents.)
+AT_CHECK([chart-get-ticks-format-test | sed 's/e\([[-+]]\)0\([[0-9]][[0-9]]\)/e\1\2/g'], [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