[i-g-t,1/1] runner: Produce json with results_version=10

Submitted by Petri Latvala on Dec. 5, 2018, 12:12 p.m.

Details

Message ID 20181205121224.13529-1-petri.latvala@intel.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Petri Latvala Dec. 5, 2018, 12:12 p.m.
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.

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>
---
 runner/resultgen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

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) :

Comments

Andi Shyti Dec. 5, 2018, 12:23 p.m.
Hi Petri,

On Wed, Dec 05, 2018 at 02:12:24PM +0200, Petri Latvala wrote:
> 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.
> 
> 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>

thank you! it works!

Tested-by: Andi Shyti <andi.shyti@intel.com>

Andi
Arkadiusz Hiler Dec. 11, 2018, 1:33 p.m.
On Wed, Dec 05, 2018 at 02:12:24PM +0200, Petri Latvala wrote:
> 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.
> 
> 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>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>