43769 2010-08-09 21:49:34 -0700 Test results server does not merge correctly for tests not in incremental json 2010-08-10 11:41:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 victorw victorw ojan oldest_to_newest 262490 0 victorw 2010-08-09 21:49:34 -0700 The current test results server iterates through tests in incremental json and merges them into existing aggregated results. For tests that are in aggregated json but not in incremental json, their results and times also need to update. 262492 1 63975 victorw 2010-08-09 22:03:52 -0700 Created attachment 63975 Proposed Patch 262756 2 63975 ojan 2010-08-10 10:44:58 -0700 Comment on attachment 63975 Proposed Patch We'll need to clobber all the results on test_results.appspot.com before we switch over to them I guess? 262764 3 victorw 2010-08-10 11:02:58 -0700 (In reply to comment #2) > (From update of attachment 63975 [details]) > We'll need to clobber all the results on test_results.appspot.com before we switch over to them I guess? yes. 262800 4 victorw 2010-08-10 11:41:01 -0700 Committed r65080: <http://trac.webkit.org/changeset/65080> 63975 2010-08-09 22:03:52 -0700 2010-08-10 10:44:57 -0700 Proposed Patch merge_json.patch text/plain 4173 victorw SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY1MDUwKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDgtMDkgIFZpY3RvciBXYW5nICA8dmlj dG9yd0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIHRlc3QgcmVzdWx0cyBzZXJ2ZXIgbWVyZ2UgbG9naWMgc28gdGhl IGFnZ3JlZ2F0ZWQKKyAgICAgICAgcmVzdWx0cyBhbmQgdGltZXMgYXJlIHVwZGF0ZWQgZm9yIHRl c3RzIHRoYXQgYXJlCisgICAgICAgIGluIGFnZ3JhZ2F0ZWQganNvbiBidXQgbm90IGluIGluY3Jl bWVudGFsIGpzb24uCisKKyAgICAgICAgQWxzbyB1cGRhdGUgdW5pdHRlc3QgdG8gdGVzdCB0aGlz IGNhc2UuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQzNzY5CisKKyAgICAgICAgKiBUZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzLnB5 OgorICAgICAgICAqIFRlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJlc3VsdHNfdW5pdHRlc3Qu cHk6CisKIDIwMTAtMDgtMDkgIEFudG9uaW8gR29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBcml5YSBIaWRheWF0LgpJbmRleDogV2ViS2l0VG9vbHMv VGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0cy5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzLnB5CShyZXZpc2lvbiA2 NTA1MCkKKysrIFdlYktpdFRvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIvbW9kZWwvanNvbnJlc3VsdHMu cHkJKHdvcmtpbmcgY29weSkKQEAgLTE3MSw4ICsxNzEsNiBAQCBjbGFzcyBKc29uUmVzdWx0cyhv YmplY3QpOgogCiAgICAgICAgICAgICAjIE1lcmdlIHRoaXMgYnVpbGQgaW50byBhZ2dyZWFnYXRl ZCByZXN1bHRzLgogICAgICAgICAgICAgY2xzLl9tZXJnZV9vbmVfYnVpbGQoYWdncmVnYXRlZF9q c29uLCBpbmNyZW1lbnRhbF9qc29uLCBpbmRleCkKLSAgICAgICAgICAgIGxvZ2dpbmcuZGVidWco Ik1lcmdlZCBidWlsZCAlcywgbWVyZ2VkIGpzb246ICVzLiIsCi0gICAgICAgICAgICAgICAgYnVp bGRfbnVtYmVyLCBhZ2dyZWdhdGVkX2pzb24pCiAKICAgICAgICAgcmV0dXJuIFRydWUKIApAQCAt MjEwLDE4ICsyMDgsMjUgQEAgY2xhc3MgSnNvblJlc3VsdHMob2JqZWN0KToKICAgICAgICAgICAg IGluY3JlbWVudGFsX2pzb246IGluY3JlbWVudGFsIGpzb24gb2JqZWN0LgogICAgICAgICAiIiIK IAotICAgICAgICBmb3IgdGVzdF9uYW1lIGluIGluY3JlbWVudGFsX2pzb246Ci0gICAgICAgICAg ICBpbmNyZW1lbnRhbF90ZXN0ID0gaW5jcmVtZW50YWxfanNvblt0ZXN0X25hbWVdCisgICAgICAg IGFsbF90ZXN0cyA9IChzZXQoYWdncmVnYXRlZF9qc29uLml0ZXJrZXlzKCkpIHwKKyAgICAgICAg ICAgICAgICAgICAgIHNldChpbmNyZW1lbnRhbF9qc29uLml0ZXJrZXlzKCkpKQorICAgICAgICBm b3IgdGVzdF9uYW1lIGluIGFsbF90ZXN0czoKICAgICAgICAgICAgIGlmIHRlc3RfbmFtZSBpbiBh Z2dyZWdhdGVkX2pzb246CiAgICAgICAgICAgICAgICAgYWdncmVnYXRlZF90ZXN0ID0gYWdncmVn YXRlZF9qc29uW3Rlc3RfbmFtZV0KKyAgICAgICAgICAgICAgICBpZiB0ZXN0X25hbWUgaW4gaW5j cmVtZW50YWxfanNvbjoKKyAgICAgICAgICAgICAgICAgICAgaW5jcmVtZW50YWxfdGVzdCA9IGlu Y3JlbWVudGFsX2pzb25bdGVzdF9uYW1lXQorICAgICAgICAgICAgICAgICAgICByZXN1bHRzID0g aW5jcmVtZW50YWxfdGVzdFtKU09OX1JFU1VMVFNfUkVTVUxUU10KKyAgICAgICAgICAgICAgICAg ICAgdGltZXMgPSBpbmNyZW1lbnRhbF90ZXN0W0pTT05fUkVTVUxUU19USU1FU10KKyAgICAgICAg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICByZXN1bHRzID0gW1sxLCAiUCJdXQor ICAgICAgICAgICAgICAgICAgICB0aW1lcyA9IFtbMSwgIjAiXV0KKwogICAgICAgICAgICAgICAg IGNscy5faW5zZXJ0X2l0ZW1fcnVuX2xlbmd0aF9lbmNvZGVkKAotICAgICAgICAgICAgICAgICAg ICBpbmNyZW1lbnRhbF90ZXN0W0pTT05fUkVTVUxUU19SRVNVTFRTXSwKLSAgICAgICAgICAgICAg ICAgICAgYWdncmVnYXRlZF90ZXN0W0pTT05fUkVTVUxUU19SRVNVTFRTXSkKKyAgICAgICAgICAg ICAgICAgICAgcmVzdWx0cywgYWdncmVnYXRlZF90ZXN0W0pTT05fUkVTVUxUU19SRVNVTFRTXSkK ICAgICAgICAgICAgICAgICBjbHMuX2luc2VydF9pdGVtX3J1bl9sZW5ndGhfZW5jb2RlZCgKLSAg ICAgICAgICAgICAgICAgICAgaW5jcmVtZW50YWxfdGVzdFtKU09OX1JFU1VMVFNfVElNRVNdLAot ICAgICAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX3Rlc3RbSlNPTl9SRVNVTFRTX1RJTUVTXSkK KyAgICAgICAgICAgICAgICAgICAgdGltZXMsIGFnZ3JlZ2F0ZWRfdGVzdFtKU09OX1JFU1VMVFNf VElNRVNdKQogICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBhZ2dyZWdhdGVkX2pz b25bdGVzdF9uYW1lXSA9IGluY3JlbWVudGFsX3Rlc3QKKyAgICAgICAgICAgICAgICBhZ2dyZWdh dGVkX2pzb25bdGVzdF9uYW1lXSA9IGluY3JlbWVudGFsX2pzb25bdGVzdF9uYW1lXQogCiAgICAg QGNsYXNzbWV0aG9kCiAgICAgZGVmIF9pbnNlcnRfaXRlbV9ydW5fbGVuZ3RoX2VuY29kZWQoY2xz LCBpbmNyZW1lbnRhbF9pdGVtLCBhZ2dyZWdhdGVkX2l0ZW0pOgpJbmRleDogV2ViS2l0VG9vbHMv VGVzdFJlc3VsdFNlcnZlci9tb2RlbC9qc29ucmVzdWx0c191bml0dGVzdC5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXRUb29scy9UZXN0UmVzdWx0U2VydmVyL21vZGVsL2pzb25yZXN1bHRzX3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiA2NTA1MCkKKysrIFdlYktpdFRvb2xzL1Rlc3RSZXN1bHRTZXJ2ZXIv bW9kZWwvanNvbnJlc3VsdHNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIwNiwxMSAr MjA2LDExIEBAIGNsYXNzIEpzb25SZXN1bHRzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSkKICAgICAg ICAgIyBOb3QgYWxsIHRlc3RzIGhhdmUgdXBkYXRlLgogICAgICAgICBzZWxmLl90ZXN0X21lcmdl KAogICAgICAgICAgICAgIyBBZ2dyZWdhdGVkIHJlc3VsdHMKLSAgICAgICAgICAgIChbIjIiLCAi MSJdLCBbWyIwMDEuaHRtbCIsICJbMjAwLFwiUFwiXSIsICJbMjAwLFwiMFwiXSJdLCBbIjAwMi5o dG1sIiwgIlsxMDAsXCJJXCJdIiwgIlsxMDAsXCIxXCJdIl1dKSwKKyAgICAgICAgICAgIChbIjIi LCAiMSJdLCBbWyIwMDEuaHRtbCIsICJbMjAwLFwiUFwiXSIsICJbMjAwLFwiMFwiXSJdLCBbIjAw Mi5odG1sIiwgIlsxMDAsXCJJXCJdIiwgIlsxMDAsXCIxXCJdIl0sIFsiMDAzLmh0bWwiLCAiWzEw LFwiRlwiXSIsICJbMTAsXCIwXCJdIl1dKSwKICAgICAgICAgICAgICMgSW5jcmVtZW50YWwgcmVz dWx0cwogICAgICAgICAgICAgKFsiMyJdLCBbWyIwMDIuaHRtbCIsICJbMSxcIklcIl0iLCAiWzEs XCIxXCJdIl1dKSwKICAgICAgICAgICAgICMgRXhwZWN0ZWQgcmVzdWx0cwotICAgICAgICAgICAg KFsiMyIsICIyIiwgIjEiXSwgW1siMDAxLmh0bWwiLCAiWzIwMCxcIlBcIl0iLCAiWzIwMCxcIjBc Il0iXSwgWyIwMDIuaHRtbCIsICJbMTAxLFwiSVwiXSIsICJbMTAxLFwiMVwiXSJdXSkpCisgICAg ICAgICAgICAoWyIzIiwgIjIiLCAiMSJdLCBbWyIwMDEuaHRtbCIsICJbMjAxLFwiUFwiXSIsICJb MjAxLFwiMFwiXSJdLCBbIjAwMi5odG1sIiwgIlsxMDEsXCJJXCJdIiwgIlsxMDEsXCIxXCJdIl0s IFsiMDAzLmh0bWwiLCAiWzEsXCJQXCJdLFsxMCxcIkZcIl0iLCAiWzExLFwiMFwiXSJdXSkpCiAK ICAgICAgICAgIyBTaW5nbGUgdGVzdCBmb3IgbXVsdGlwbGUgcnVucy4KICAgICAgICAgc2VsZi5f dGVzdF9tZXJnZSgK