65464 2011-08-01 04:51:55 -0700 [ORWT] Fix --reset-results --add-platform-exceptions combo 2011-08-22 03:06:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ossy kkristof ossy oldest_to_newest 444662 0 ossy 2011-08-01 04:51:55 -0700 I usually use ORWT with "-p --platform qt --reset-results --add-platform-exceptions" options to create new and/or update Qt specific expected results for a bunch of tests. Now if we use only --reset-results option, - platform independent expected result is reseted if there isn't platform specific result before (good) - platform specific expected result is reseted if there is platform specific result (good) Now if we use only --add-platform-exceptions option, - platform specific expected result is be added if there isn't platform specific result (good) - nothing happens if there is platform specific result (maybe good) Now if we use --add-platform-exceptions and --reset-results options, - platform independent expected result is reseted if there isn't platform specific result before ( <---- BUG!!! ) - platform specific expected result is reseted if there is platform specific result (good) - platform specific expected result is added if there isn't platform specific result (good) I run into a bug and/or feature. There are a bunch of tests need new and/or updated platform specific expected results: - tests with and without platform independent expected results - tests with and without platform specific expected results It would be great if it is possible with ORWT to generate or reset all platform specific results with one run with --add-platform-exceptions and --reset-results options. 444670 1 ossy 2011-08-01 06:09:36 -0700 There is a similar or same bug, when I use platform qt-4.8. When I use --reset-results and --add-platform-exceptions combo and there isn't qt-4.8 specific expected result, unfortunately the qt specific expected result will be resetted instead of the qt-4.8 one. 447859 2 103205 kkristof 2011-08-07 23:47:26 -0700 Created attachment 103205 proposed fix 454508 3 103205 ossy 2011-08-22 03:05:44 -0700 Comment on attachment 103205 proposed fix great work, r=me. 454509 4 ossy 2011-08-22 03:06:19 -0700 Landed in https://trac.webkit.org/changeset/93502 103205 2011-08-07 23:47:26 -0700 2011-08-22 03:06:29 -0700 proposed fix 0808.patch text/plain 2241 kkristof ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2MDc2 NDBiLi5lMzg3NjhlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDgtMDcgIEtyaXN0w7NmIEtvc3p0ecOzICA8 S29zenR5by5LcmlzdG9mQHN0dWQudS1zemVnZWQuaHU+CisKKyAgICAgICAgW09SV1RdIEZpeCAt LXJlc2V0LXJlc3VsdHMgLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyBjb21ibworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU0NjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvb2xkLXJ1bi13 ZWJraXQtdGVzdHM6CisKIDIwMTEtMDgtMDcgIFNhbSBXaGl0ZSAgPHNhbXVlbC53aGl0ZUByb2No ZXN0ZXIuZWR1PgogCiAgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBzZWFyY2ggdGhlIEFjY2Vz c2liaWxpdHlPYmplY3QgY2FjaGUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13 ZWJraXQtdGVzdHMgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmluZGV4IDUw ZTFmZjEuLjYzZTQ1Y2UgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQt dGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cwpAQCAtOTU0LDgg Kzk1NCwxMyBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgICAgICB9CiAKICAgICAgICAg aWYgKCRyZXNldFJlc3VsdHMgfHwgIS1mICRleHBlY3RlZFBOR1BhdGgpIHsKLSAgICAgICAgICAg IG1rcGF0aCBjYXRmaWxlKCRleHBlY3RlZFBpeGVsRGlyLCBkaXJuYW1lKCRiYXNlKSkgaWYgJHRl c3REaXJlY3RvcnkgbmUgJGV4cGVjdGVkUGl4ZWxEaXI7Ci0gICAgICAgICAgICB3cml0ZVRvRmls ZSgkZXhwZWN0ZWRQTkdQYXRoLCAkYWN0dWFsUE5HKTsKKyAgICAgICAgICAgIGlmICghJGFkZFBs YXRmb3JtRXhjZXB0aW9ucykgeworICAgICAgICAgICAgICAgIG1rcGF0aCBjYXRmaWxlKCRleHBl Y3RlZFBpeGVsRGlyLCBkaXJuYW1lKCRiYXNlKSkgaWYgJHRlc3REaXJlY3RvcnkgbmUgJGV4cGVj dGVkUGl4ZWxEaXI7CisgICAgICAgICAgICAgICAgd3JpdGVUb0ZpbGUoJGV4cGVjdGVkUE5HUGF0 aCwgJGFjdHVhbFBORyk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIG1r cGF0aCBjYXRmaWxlKCRwbGF0Zm9ybVRlc3REaXJlY3RvcnksIGRpcm5hbWUoJGJhc2UpKTsKKyAg ICAgICAgICAgICAgICB3cml0ZVRvRmlsZSgiJHBsYXRmb3JtVGVzdERpcmVjdG9yeS8kYmFzZS0k ZXhwZWN0ZWRUYWcucG5nIiwgJGFjdHVhbFBORyk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0K ICAgICB9CiAKQEAgLTk2OSw4ICs5NzQsMTMgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAg ICAgICAgJHJlc3VsdCA9ICJuZXciOwogCiAgICAgICAgIGlmICgkZ2VuZXJhdGVOZXdSZXN1bHRz IHx8ICRyZXNldFJlc3VsdHMpIHsKLSAgICAgICAgICAgIG1rcGF0aCBjYXRmaWxlKCRleHBlY3Rl ZERpciwgZGlybmFtZSgkYmFzZSkpIGlmICR0ZXN0RGlyZWN0b3J5IG5lICRleHBlY3RlZERpcjsK LSAgICAgICAgICAgIHdyaXRlVG9GaWxlKCIkZXhwZWN0ZWREaXIvJGV4cGVjdGVkRmlsZU5hbWUi LCAkYWN0dWFsKTsKKyAgICAgICAgICAgIGlmICghJGFkZFBsYXRmb3JtRXhjZXB0aW9ucykgewor ICAgICAgICAgICAgICAgIG1rcGF0aCBjYXRmaWxlKCRleHBlY3RlZERpciwgZGlybmFtZSgkYmFz ZSkpIGlmICR0ZXN0RGlyZWN0b3J5IG5lICRleHBlY3RlZERpcjsKKyAgICAgICAgICAgICAgICB3 cml0ZVRvRmlsZSgiJGV4cGVjdGVkRGlyLyRleHBlY3RlZEZpbGVOYW1lIiwgJGFjdHVhbCk7Cisg ICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIG1rcGF0aCBjYXRmaWxlKCRwbGF0 Zm9ybVRlc3REaXJlY3RvcnksIGRpcm5hbWUoJGJhc2UpKTsKKyAgICAgICAgICAgICAgICB3cml0 ZVRvRmlsZSgiJHBsYXRmb3JtVGVzdERpcmVjdG9yeS8kZXhwZWN0ZWRGaWxlTmFtZSIsICRhY3R1 YWwpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGRlbGV0ZUV4cGVjdGVkQW5k QWN0dWFsUmVzdWx0cygkYmFzZSk7CiAgICAgICAgIHJlY29yZEFjdHVhbFJlc3VsdHNBbmREaWZm KCRiYXNlLCAkYWN0dWFsKTsK