From 2c793666d8c8328733f5769b16ae5858fee97f3f Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Wed, 5 Dec 2018 14:53:43 +0200 Subject: runner: Produce json with results_version=10 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 Signed-off-by: Petri Latvala Cc: Arkadiusz Hiler Cc: Andi Shyti Tested-by: Andi Shyti Reviewed-by: Arkadiusz Hiler --- 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-escapes/reference.json | 2 +- runner/json_tests_data/dmesg-results/reference.json | 2 +- runner/json_tests_data/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 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'runner') 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-escapes/reference.json b/runner/json_tests_data/dmesg-escapes/reference.json index 9b4df640..a6a70109 100644 --- a/runner/json_tests_data/dmesg-escapes/reference.json +++ b/runner/json_tests_data/dmesg-escapes/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 659b5e62..a1a91cd0 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -1069,7 +1069,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) : -- cgit v1.2.3