summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-07-27 12:20:53 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-11-02 14:29:34 (GMT)
commit4dabd36fe0cd52dc297d2fa56c50917314c385a2 (patch)
tree2a413f6df77324ce559ceb208a572061b6d1f85f
parent27e6214401970b809e0e594cccaa3b3bddad151a (diff)
downloadQt-4dabd36fe0cd52dc297d2fa56c50917314c385a2.zip
Qt-4dabd36fe0cd52dc297d2fa56c50917314c385a2.tar.gz
Qt-4dabd36fe0cd52dc297d2fa56c50917314c385a2.tar.bz2
Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
+/-nan tests fail when QT_QLOCALE_USES_FCVT is set Because the behavior of qstrtod and strtod of glibc differs
-rw-r--r--tests/auto/qstring/tst_qstring.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp
index 9df2a4d..16cf872 100644
--- a/tests/auto/qstring/tst_qstring.cpp
+++ b/tests/auto/qstring/tst_qstring.cpp
@@ -4433,8 +4433,10 @@ void tst_QString::nanAndInf()
CHECK_NAN("nan ", true, true)
CHECK_NAN("\t NAN", true, true)
CHECK_NAN("\t NAN ", true, true)
+#ifndef QT_QLOCALE_USES_FCVT //In case we use glibc this tests will fail
CHECK_NAN("-nan", false, false)
CHECK_NAN("+NAN", false, false)
+#endif
CHECK_NAN("NaN", true, true)
CHECK_NAN("nAn", true, true)
CHECK_NAN("NANe-10", false, false)