tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[render test] Fix probes failure reports

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-12-13 14:23:47 +02:00
parent 06a2930342
commit 515cb4e0fc
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
render-test/parser.cpp
View File

@@ -949,7 +949,6 @@ TestOperations parseTestOperations(TestMetadata& metadata, const Manifest& manif
});
} else if (operationArray[0].GetString() == memoryProbeOp) {
// probeMemory
assert(AllocationIndex::isActive());
assert(operationArray.Size() >= 2u);
assert(operationArray[1].IsString());
std::string mark = std::string(operationArray[1].GetString(), operationArray[1].GetStringLength());
@@ -959,6 +958,7 @@ TestOperations parseTestOperations(TestMetadata& metadata, const Manifest& manif
tolerance = float(operationArray[2].GetDouble());
}
result.emplace_back([mark, tolerance](TestContext& ctx) {
assert(AllocationIndex::isActive());
auto emplaced = ctx.getMetadata().metrics.memory.emplace(
std::piecewise_construct,
std::forward_as_tuple(std::move(mark)),
@@ -1052,9 +1052,9 @@ TestOperations parseTestOperations(TestMetadata& metadata, const Manifest& manif
array.emplace_back(*arrayVal);
}
}
std::unordered_map<std::string, Value> result;
result[k] = std::move(array);
stateValue = std::move(result);
std::unordered_map<std::string, Value> values;
values[k] = std::move(array);
stateValue = std::move(values);
valueParsed = true;
return nullopt;

6
render-test/render_test.cpp
View File

@@ -177,11 +177,7 @@ int runRenderTests(int argc, char** argv, std::function<void()> testStatus) {
}
}
bool errored = !metadata.errorMessage.empty();
if (!errored) {
errored = !runner.run(metadata) || !metadata.errorMessage.empty();
}
bool errored = !metadata.errorMessage.empty() || !runner.run(metadata);
bool passed =
!errored && (!metadata.outputsImage || !metadata.diff.empty()) && metadata.difference <= metadata.allowed;

4
render-test/runner.cpp
View File

@@ -688,7 +688,6 @@ bool TestRunner::run(TestMetadata& metadata) {
ctx.runnerImpl = maps[key].get();
auto& frontend = ctx.getFrontend();
// auto& map = ctx.getMap();
resetContext(metadata, ctx);
@@ -711,7 +710,8 @@ bool TestRunner::run(TestMetadata& metadata) {
}
if (metadata.renderTest) {
return checkRenderTestResults(std::move(result.image), metadata) && checkProbingResults(metadata);
(void)checkProbingResults(metadata);
return checkRenderTestResults(std::move(result.image), metadata);
} else {
std::vector<mbgl::Feature> features;
assert(metadata.document["metadata"]["test"]["queryGeometry"].IsArray());