diff options
author | aavit <qt-info@nokia.com> | 2011-08-05 10:32:52 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2011-08-05 10:51:17 (GMT) |
commit | b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7 (patch) | |
tree | 4428b9dad8a78493ffe4078c0c94b7ca494ebcbe /tests/auto | |
parent | fdc3d5590103f5cbbcfc1a7efec75316ae60eb7b (diff) | |
download | Qt-b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7.zip Qt-b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7.tar.gz Qt-b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7.tar.bz2 |
Add option to compare to different platform in lancelot autotest
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/lancelot/tst_lancelot.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp index cba5fab..256ff29 100644 --- a/tests/auto/lancelot/tst_lancelot.cpp +++ b/tests/auto/lancelot/tst_lancelot.cpp @@ -62,6 +62,7 @@ public: tst_Lancelot(); static bool simfail; + static PlatformInfo clientInfo; private: enum GraphicsEngine { @@ -98,6 +99,7 @@ private slots: }; bool tst_Lancelot::simfail = false; +PlatformInfo tst_Lancelot::clientInfo; tst_Lancelot::tst_Lancelot() { @@ -112,7 +114,7 @@ void tst_Lancelot::initTestCase() #if defined(Q_OS_SOMEPLATFORM) QSKIP("This test is not supported on this platform.", SkipAll); #endif - if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode)) + if (!proto.connect(QLatin1String("tst_Lancelot"), &dryRunMode, clientInfo)) QSKIP(qPrintable(proto.errorMessage()), SkipAll); #if defined(USE_RUNTIME_DIR) @@ -329,13 +331,26 @@ QTEST_MAIN(tst_Lancelot) int main(int argc, char *argv[]) { + tst_Lancelot::clientInfo = PlatformInfo::localHostInfo(); + char *fargv[20]; int fargc = 0; for (int i = 0; i < qMin(argc, 19); i++) { - if (!qstrcmp(argv[i], "-simfail")) + if (!qstrcmp(argv[i], "-simfail")) { tst_Lancelot::simfail = true; - else + } else if (!qstrcmp(argv[i], "-compareto") && i < argc-1) { + QString arg = QString::fromLocal8Bit(argv[++i]); + int split = arg.indexOf(QLC('=')); + if (split < 0) + continue; + QString key = arg.left(split).trimmed(); + QString value = arg.mid(split+1).trimmed(); + if (key.isEmpty() || value.isEmpty()) + continue; + tst_Lancelot::clientInfo.addOverride(key, value); + } else { fargv[fargc++] = argv[i]; + } } fargv[fargc] = 0; return rmain(fargc, fargv); |