From cd201b2c2c2849fea0c5a38ffd979cd9d5b24997 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Tue, 13 Nov 2018 11:15:44 +0100 Subject: Adjust QTRY_IMPL()'s default timestep MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was previously using 50ms steps, which was a bad choice for client code whose total time-out was comparable to 50ms or less. Reduce the time-step so that we loop several times within the timeout (but make sure it's never zero, by adding 1ms). Change-Id: I0428a7741c0741dfb312e40ae1eda900050195ab Reviewed-by: Jędrzej Nowacki --- src/testlib/qtestcase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/testlib/qtestcase.h') diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 54669c11de..fbc251a2a2 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -150,7 +150,7 @@ do {\ // Ideally we'd use qWaitFor instead of QTRY_LOOP_IMPL, but due // to a compiler bug on MSVC < 2017 we can't (see QTBUG-59096) #define QTRY_IMPL(expr, timeout)\ - const int qt_test_step = 50; \ + const int qt_test_step = timeout < 350 ? timeout / 7 + 1 : 50; \ const int qt_test_timeoutValue = timeout; \ QTRY_LOOP_IMPL((expr), qt_test_timeoutValue, qt_test_step); \ QTRY_TIMEOUT_DEBUG_IMPL((expr), qt_test_timeoutValue, qt_test_step)\ -- cgit v1.2.3 From c7453cf6767d5be43de878291e7eff371f200b4d Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 1 Nov 2018 09:58:40 +0100 Subject: Testlib: Explicitly cast messages to const char * MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macro parameters should always be enclosed in braces when used. Plain C strings passed in parantheses are interpreted as const char[], at least by clang-tidy. Implicitly decaying arrays into pointers should be avoided and clang-tidy warns about this. Avoid both problems by always static casting all messages to const char *. Change-Id: I2be668169bec2823f69af3aa75086a31b0b31938 Reviewed-by: Friedemann Kleint Reviewed-by: Mitch Curtis Reviewed-by: Tor Arne Vestbø Reviewed-by: Edward Welbourne --- src/testlib/qtestcase.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/testlib/qtestcase.h') diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index f6891dc941..a6f1711230 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -67,17 +67,17 @@ do {\ #define QFAIL(message) \ do {\ - QTest::qFail(message, __FILE__, __LINE__);\ + QTest::qFail(static_cast(message), __FILE__, __LINE__);\ return;\ } while (false) #define QVERIFY2(statement, description) \ do {\ if (statement) {\ - if (!QTest::qVerify(true, #statement, (description), __FILE__, __LINE__))\ + if (!QTest::qVerify(true, #statement, static_cast(description), __FILE__, __LINE__))\ return;\ } else {\ - if (!QTest::qVerify(false, #statement, (description), __FILE__, __LINE__))\ + if (!QTest::qVerify(false, #statement, static_cast(description), __FILE__, __LINE__))\ return;\ }\ } while (false) @@ -184,7 +184,7 @@ do { \ #define QSKIP_INTERNAL(statement) \ do {\ - QTest::qSkip(statement, __FILE__, __LINE__);\ + QTest::qSkip(static_cast(statement), __FILE__, __LINE__);\ return;\ } while (false) @@ -200,7 +200,7 @@ do {\ #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ - if (!QTest::qExpectFail(dataIndex, comment, QTest::mode, __FILE__, __LINE__))\ + if (!QTest::qExpectFail(dataIndex, static_cast(comment), QTest::mode, __FILE__, __LINE__))\ return;\ } while (false) @@ -217,7 +217,7 @@ do {\ } while (false) #define QWARN(msg)\ - QTest::qWarn(msg, __FILE__, __LINE__) + QTest::qWarn(static_cast(msg), __FILE__, __LINE__) #ifdef QT_TESTCASE_BUILDDIR # define QFINDTESTDATA(basepath)\ -- cgit v1.2.3 From 37f617c405ae4f26cbb6bb4f08d61d6ccc111a98 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 9 Nov 2018 14:05:35 +0100 Subject: Add qfloat16 support to QCOMPARE Change-Id: Ide06f215a888328308a06e7e48edd666f790a5f0 Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- src/testlib/qtestcase.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/testlib/qtestcase.h') diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index a6f1711230..39364df8ef 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -57,6 +57,7 @@ QT_BEGIN_NAMESPACE +class qfloat16; class QRegularExpression; #define QVERIFY(statement) \ @@ -361,6 +362,9 @@ namespace QTest } #endif + Q_TESTLIB_EXPORT bool qCompare(qfloat16 const &t1, qfloat16 const &t2, + const char *actual, const char *expected, const char *file, int line); + Q_TESTLIB_EXPORT bool qCompare(float const &t1, float const &t2, const char *actual, const char *expected, const char *file, int line); @@ -405,6 +409,7 @@ namespace QTest QTEST_COMPARE_DECL(float) QTEST_COMPARE_DECL(double) + QTEST_COMPARE_DECL(qfloat16) QTEST_COMPARE_DECL(char) QTEST_COMPARE_DECL(signed char) QTEST_COMPARE_DECL(unsigned char) -- cgit v1.2.3 From 4628e5cded8b1b4f064b75f23436bc6fc66ce043 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 2 Apr 2019 11:56:33 +0200 Subject: Remove handling of missing very old compiler feature check Removes handling of missing Q_COMPILER_NULLPTR, Q_COMPILER_AUTODECL, Q_COMPILER_LAMBDA, Q_COMPILER_VARIADIC_MACROS and Q_COMPILER_AUTO_FUNCTION. We haven't supported any compilers without these for a long time. Change-Id: I3df88206516a25763e2c28b083733780f35a8764 Reviewed-by: Thiago Macieira --- src/testlib/qtestcase.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/testlib/qtestcase.h') diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 5d566b835e..794283ff78 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -189,16 +189,8 @@ do {\ return;\ } while (false) -#ifdef Q_COMPILER_VARIADIC_MACROS - #define QSKIP(statement, ...) QSKIP_INTERNAL(statement) -#else - -#define QSKIP(statement) QSKIP_INTERNAL(statement) - -#endif - #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ if (!QTest::qExpectFail(dataIndex, static_cast(comment), QTest::mode, __FILE__, __LINE__))\ -- cgit v1.2.3