From: Petri Latvala <petri.latvala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t v2 1/1] runner: Produce json with results_version=10
Date: Wed, 5 Dec 2018 14:53:43 +0200 [thread overview]
Message-ID: <20181205125343.14828-1-petri.latvala@intel.com> (raw)
In-Reply-To: <20181205121224.13529-1-petri.latvala@intel.com>
New piglit bumped its results_version to 10, making glxinfo and pals
optional in practice, not just by accident. Unfortunately reading
results with newer piglit attempts to convert the results to version
10, reading glxinfo and pals, and thus fails. In a hilarious summary:
A commit to piglit making glxinfo optional makes it mandatory for us.
v2: json unit tests confirmed to be working...
Reported-by: Andi Shyti <andi.shyti@intel.com>
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Andi Shyti <andi.shyti@intel.com>
Tested-by: Andi Shyti <andi.shyti@intel.com>
---
runner/json_tests_data/aborted-after-a-test/reference.json | 2 +-
runner/json_tests_data/aborted-on-boot/reference.json | 2 +-
runner/json_tests_data/dmesg-results/reference.json | 2 +-
.../incomplete-before-any-subtests/reference.json | 2 +-
runner/json_tests_data/normal-run/reference.json | 2 +-
runner/json_tests_data/piglit-style-dmesg/reference.json | 2 +-
runner/json_tests_data/warnings-with-dmesg-warns/reference.json | 2 +-
runner/json_tests_data/warnings/reference.json | 2 +-
runner/resultgen.c | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/runner/json_tests_data/aborted-after-a-test/reference.json b/runner/json_tests_data/aborted-after-a-test/reference.json
index 1e08deca..19ba9285 100644
--- a/runner/json_tests_data/aborted-after-a-test/reference.json
+++ b/runner/json_tests_data/aborted-after-a-test/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/aborted-on-boot/reference.json b/runner/json_tests_data/aborted-on-boot/reference.json
index bfaee1bb..0a8723eb 100644
--- a/runner/json_tests_data/aborted-on-boot/reference.json
+++ b/runner/json_tests_data/aborted-on-boot/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/dmesg-results/reference.json b/runner/json_tests_data/dmesg-results/reference.json
index 811b63eb..445cd0a0 100644
--- a/runner/json_tests_data/dmesg-results/reference.json
+++ b/runner/json_tests_data/dmesg-results/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/incomplete-before-any-subtests/reference.json b/runner/json_tests_data/incomplete-before-any-subtests/reference.json
index 3eb6c9c1..8dc684c8 100644
--- a/runner/json_tests_data/incomplete-before-any-subtests/reference.json
+++ b/runner/json_tests_data/incomplete-before-any-subtests/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/normal-run/reference.json b/runner/json_tests_data/normal-run/reference.json
index 0d28b2c2..5e62579b 100644
--- a/runner/json_tests_data/normal-run/reference.json
+++ b/runner/json_tests_data/normal-run/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/piglit-style-dmesg/reference.json b/runner/json_tests_data/piglit-style-dmesg/reference.json
index 2257b3c7..59f46595 100644
--- a/runner/json_tests_data/piglit-style-dmesg/reference.json
+++ b/runner/json_tests_data/piglit-style-dmesg/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json b/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
index 9e027efb..f70990e8 100644
--- a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
+++ b/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/json_tests_data/warnings/reference.json b/runner/json_tests_data/warnings/reference.json
index 8d5edbe1..dade0439 100644
--- a/runner/json_tests_data/warnings/reference.json
+++ b/runner/json_tests_data/warnings/reference.json
@@ -1,6 +1,6 @@
{
"__type__":"TestrunResult",
- "results_version":9,
+ "results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
"time_elapsed":{
diff --git a/runner/resultgen.c b/runner/resultgen.c
index b0933ad7..f2bf62b3 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -1026,7 +1026,7 @@ struct json_object *generate_results_json(int dirfd)
obj = json_object_new_object();
json_object_object_add(obj, "__type__", json_object_new_string("TestrunResult"));
- json_object_object_add(obj, "results_version", json_object_new_int(9));
+ json_object_object_add(obj, "results_version", json_object_new_int(10));
json_object_object_add(obj, "name",
settings.name ?
json_object_new_string(settings.name) :
--
2.19.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2018-12-05 12:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 12:12 [igt-dev] [PATCH i-g-t 1/1] runner: Produce json with results_version=10 Petri Latvala
2018-12-05 12:23 ` Andi Shyti
2018-12-05 12:48 ` [igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/1] " Patchwork
2018-12-05 12:53 ` Petri Latvala [this message]
2018-12-05 13:49 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/1] runner: Produce json with results_version=10 (rev2) Patchwork
2018-12-05 17:54 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-12-11 13:33 ` [igt-dev] [PATCH i-g-t 1/1] runner: Produce json with results_version=10 Arkadiusz Hiler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181205125343.14828-1-petri.latvala@intel.com \
--to=petri.latvala@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox