summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-10-11 15:51:11 +0300
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-10-21 16:10:45 +0300
commiteb3c203d4ed65a91b818c42876bf2f23784aa9c5 (patch)
tree9434f8e3ef53dc7528aab5dc1f3e91247f6b551e
parent8bdd8ec67058b0290d56d4b0b6b01ab84e4c2006 (diff)
downloadqtlocation-mapboxgl-eb3c203d4ed65a91b818c42876bf2f23784aa9c5.tar.gz
[test runner] Adjust memory metrics test results
-rw-r--r--render-test/render_test.cpp3
-rw-r--r--render-test/tests/memory/fail-memory-size-is-too-big/metrics.json20
-rw-r--r--render-test/tests/memory/fail-memory-size-is-too-small/metrics.json20
-rw-r--r--render-test/tests/memory/pass-memory-size-is-same/metrics.json20
-rw-r--r--render-test/tests/memory/pass-memory-size-is-same/style.json4
5 files changed, 62 insertions, 5 deletions
diff --git a/render-test/render_test.cpp b/render-test/render_test.cpp
index bac193237d..ac54d08ca0 100644
--- a/render-test/render_test.cpp
+++ b/render-test/render_test.cpp
@@ -125,6 +125,9 @@ int runRenderTests(int argc, char** argv) {
color = "red";
stats.erroredTests++;
printf(ANSI_COLOR_RED "* errored %s" ANSI_COLOR_RESET "\n", id.c_str());
+ if (!metadata.errorMessage.empty()) {
+ printf(ANSI_COLOR_RED "* error: %s" ANSI_COLOR_RESET "\n", metadata.errorMessage.c_str());
+ }
} else {
status = "failed";
color = "red";
diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json
index 69832a1d9f..3e55e0c60e 100644
--- a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json
+++ b/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json
@@ -1 +1,19 @@
-{"memory":[["after setZoom 0.9",33271,62],["end",40000,118],["start",0,0]]}
+{
+ "memory": [
+ [
+ "after setZoom 0.9",
+ 33271,
+ 62
+ ],
+ [
+ "end",
+ 40000,
+ 118
+ ],
+ [
+ "start",
+ 0,
+ 0
+ ]
+ ]
+}
diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json
index 51cdc6267c..7e3997675b 100644
--- a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json
+++ b/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json
@@ -1 +1,19 @@
-{"memory":[["after setZoom 0.9",33271,62],["end",60000,118],["start",0,0]]}
+{
+ "memory": [
+ [
+ "after setZoom 0.9",
+ 33271,
+ 62
+ ],
+ [
+ "end",
+ 60000,
+ 118
+ ],
+ [
+ "start",
+ 0,
+ 0
+ ]
+ ]
+}
diff --git a/render-test/tests/memory/pass-memory-size-is-same/metrics.json b/render-test/tests/memory/pass-memory-size-is-same/metrics.json
index 9ed24a99c7..4baa38c7f7 100644
--- a/render-test/tests/memory/pass-memory-size-is-same/metrics.json
+++ b/render-test/tests/memory/pass-memory-size-is-same/metrics.json
@@ -1 +1,19 @@
-{"memory":[["after setZoom 0.9",33271,62],["end",47833,118],["start",0,0]]} \ No newline at end of file
+{
+ "memory": [
+ [
+ "after setZoom 0.9",
+ 33271,
+ 62
+ ],
+ [
+ "end",
+ 47833,
+ 118
+ ],
+ [
+ "start",
+ 0,
+ 0
+ ]
+ ]
+} \ No newline at end of file
diff --git a/render-test/tests/memory/pass-memory-size-is-same/style.json b/render-test/tests/memory/pass-memory-size-is-same/style.json
index b2805ef34f..d1c09f69f9 100644
--- a/render-test/tests/memory/pass-memory-size-is-same/style.json
+++ b/render-test/tests/memory/pass-memory-size-is-same/style.json
@@ -15,7 +15,7 @@
[
"wait"
],
- [ "probeMemory", "after setZoom 0.9", 0.005 ],
+ [ "probeMemory", "after setZoom 0.9", 0.01 ],
[
"setLayerZoomRange",
"circle",
@@ -25,7 +25,7 @@
[
"wait"
],
- [ "probeMemory", "end", 0.005 ],
+ [ "probeMemory", "end", 0.01 ],
[ "probeMemoryEnd" ]
]
}