diff options
Diffstat (limited to 'tests/baselineserver/shared/qbaselinetest.cpp')
| -rw-r--r-- | tests/baselineserver/shared/qbaselinetest.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/tests/baselineserver/shared/qbaselinetest.cpp b/tests/baselineserver/shared/qbaselinetest.cpp index ef38e21edb..11fb208f20 100644 --- a/tests/baselineserver/shared/qbaselinetest.cpp +++ b/tests/baselineserver/shared/qbaselinetest.cpp @@ -46,6 +46,7 @@ static BaselineProtocol proto; static bool connected = false; static bool triedConnecting = false; static bool dryRunMode = false; +static enum { UploadMissing, UploadAll, UploadNone } baselinePolicy = UploadMissing; static QByteArray curFunction; static ImageItemList itemList; @@ -71,12 +72,26 @@ void handleCmdLineArgs(int *argcp, char ***argvp) if (arg == "-simfail") { simfail = true; + } else if (arg == "-fuzzlevel") { + i++; + bool ok = false; + (void)nextArg.toInt(&ok); + if (!ok) { + qWarning() << "-fuzzlevel requires integer parameter"; + showHelp = true; + break; + } + customInfo.insert("FuzzLevel", QString::fromLatin1(nextArg)); } else if (arg == "-auto") { customAutoModeSet = true; customInfo.setAdHocRun(false); } else if (arg == "-adhoc") { customAutoModeSet = true; customInfo.setAdHocRun(true); + } else if (arg == "-setbaselines") { + baselinePolicy = UploadAll; + } else if (arg == "-nosetbaselines") { + baselinePolicy = UploadNone; } else if (arg == "-compareto") { i++; int split = qMax(0, nextArg.indexOf('=')); @@ -106,8 +121,11 @@ void handleCmdLineArgs(int *argcp, char ***argvp) QTextStream out(stdout); out << "\n Baseline testing (lancelot) options:\n"; out << " -simfail : Force an image comparison mismatch. For testing purposes.\n"; + out << " -fuzzlevel <int> : Specify the percentage of fuzziness in comparison. Overrides server default. 0 means exact match.\n"; out << " -auto : Inform server that this run is done by a daemon, CI system or similar.\n"; out << " -adhoc (default) : The inverse of -auto; this run is done by human, e.g. for testing.\n"; + out << " -setbaselines : Store ALL rendered images as new baselines. Forces replacement of previous baselines.\n"; + out << " -nosetbaselines : Do not store rendered images as new baselines when previous baselines are missing.\n"; out << " -compareto KEY=VAL : Force comparison to baselines from a different client,\n"; out << " for example: -compareto QtVersion=4.8.0\n"; out << " Multiple -compareto client specifications may be given.\n"; @@ -276,8 +294,8 @@ bool compareItem(const ImageItem &baseline, const QImage &img, QByteArray *msg, return true; break; case ImageItem::BaselineNotFound: - if (!customInfo.overrides().isEmpty()) { - qWarning() << "Cannot compare to other system's baseline: No such baseline found on server."; + if (!customInfo.overrides().isEmpty() || baselinePolicy == UploadNone) { + qWarning() << "Cannot compare to baseline: No such baseline found on server."; return true; } if (proto.submitNewBaseline(item, &srvMsg)) @@ -298,6 +316,14 @@ bool compareItem(const ImageItem &baseline, const QImage &img, QByteArray *msg, qWarning() << "Failed to report image match to server:" << srvMsg; return true; } + // At this point, we have established a legitimate mismatch + if (baselinePolicy == UploadAll) { + if (proto.submitNewBaseline(item, &srvMsg)) + qDebug() << msg->constData() << "Forcing new baseline; uploaded ok."; + else + qDebug() << msg->constData() << "Forcing new baseline; uploading failed:" << srvMsg; + return true; + } bool fuzzyMatch = false; bool res = proto.submitMismatch(item, &srvMsg, &fuzzyMatch); if (res && fuzzyMatch) { |