35367 2010-02-24 16:14:53 -0800 fix check_sys_deps/start_helper ordering, and fix check_sys_deps proto on mac 2010-02-24 17:03:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan oldest_to_newest 193552 0 dpranke 2010-02-24 16:14:53 -0800 fix check_sys_deps/start_helper ordering, and fix check_sys_deps proto on mac 193554 1 49449 dpranke 2010-02-24 16:17:30 -0800 Created attachment 49449 Patch 193558 2 49449 levin 2010-02-24 16:37:48 -0800 Comment on attachment 49449 Patch two things to consider below. > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > + http://ubgs.webkit.org/show_bug.cgi?id=35367 typo: "ubgs" > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py > + # Check that the system dependencies (themes, fonts, ...) are correct. > + if not options.nocheck_sys_deps: > + if not port_obj.check_sys_deps(test_runner.needs_http()): Why not do an "and" instead of nested if's. > + sys.exit(1) 193559 3 dpranke 2010-02-24 16:38:57 -0800 (In reply to comment #2) > (From update of attachment 49449 [details]) > two things to consider below. > > > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > > + http://ubgs.webkit.org/show_bug.cgi?id=35367 > > typo: "ubgs" whoops. > > > diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_chromium_webkit_tests.py > > > + # Check that the system dependencies (themes, fonts, ...) are correct. > > + if not options.nocheck_sys_deps: > > + if not port_obj.check_sys_deps(test_runner.needs_http()): > > Why not do an "and" instead of nested if's. > > > + sys.exit(1) will do. 193563 4 dpranke 2010-02-24 17:03:20 -0800 Fix landed in r55208. Closing bug. 49449 2010-02-24 16:17:30 -0800 2010-02-24 16:37:48 -0800 Patch bug-35367-20100224161729.patch text/plain 4045 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3NWY5NzBiLi5jYzNlMWExIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTkgQEAKIDIwMTAtMDIt MjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IHRoZSBmdW5jdGlvbiBzaWduYXR1 cmUgZm9yIGNoZWNrX3N5c19kZXBzIG9uIHRoZSBtYWMgcG9ydCwgYW5kCisgICAgICAgIGZpeCB0 aGUgb3JkZXJpbmcgb2YgcG9ydF9vYmouY2hlY2tfc3lzX2RlcHMoKSBhbmQKKyAgICAgICAgcG9y dF9vYmouc3RhcnRfaGVscGVyKCkgKGhlbHBlciBuZWVkcyB0byBiZSBzdGFydGVkIGJlZm9yZSB3 ZSBjaGVjaworICAgICAgICB0aGUgc3lzdGVtIGNvbmZpZ3VyYXRpb24pLgorCisgICAgICAgIGh0 dHA6Ly91YmdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1MzY3CisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5Ogor CisyMDEwLTAyLTI0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgU2llZGVsLgogCiAgICAgICAgIENoZWNrIHRoZSBwcm9wZXIg ZGlyZWN0b3J5IGZvciBhIFdlYktpdCBTVk4gdmVyc2lvbiAoQ2hyb21pdW0gZG9lcwpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tYWMu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5w eQppbmRleCBkMzU1ZjYyLi45YjcwY2I3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQorKysgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21hYy5weQpAQCAtNjYsNyArNjYsNyBAQCBj bGFzcyBNYWNQb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIGRpcnMuYXBwZW5kKHNlbGYuX3dlYmtp dF9iYXNlbGluZV9wYXRoKCdtYWMnKSkKICAgICAgICAgcmV0dXJuIGRpcnMKIAotICAgIGRlZiBj aGVja19zeXNfZGVwcyhzZWxmKToKKyAgICBkZWYgY2hlY2tfc3lzX2RlcHMoc2VsZiwgbmVlZHNf aHR0cCk6CiAgICAgICAgIGlmIGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbc2VsZi5zY3JpcHRfcGF0 aCgiYnVpbGQtZHVtcHJlbmRlcnRyZWUiKV0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkgIT0gMDoK ICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fY2hyb21pdW1fd2Via2l0X3Rlc3RzLnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX2Nocm9taXVtX3dl YmtpdF90ZXN0cy5weQppbmRleCBiNmQ5YjM1Li43YTg5ZTk4IDEwMDc1NQotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fY2hyb21pdW1fd2Via2l0X3Rl c3RzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl9jaHJvbWl1bV93ZWJraXRfdGVzdHMucHkKQEAgLTU3OSw3ICs1NzksNiBAQCBjbGFzcyBUZXN0 UnVubmVyOgogICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAgICAgICBm b3IgdGhyZWFkIGluIHRocmVhZHM6CiAgICAgICAgICAgICAgICAgdGhyZWFkLmNhbmNlbCgpCi0g ICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3BfaGVscGVyKCkKICAgICAgICAgICAgIHJhaXNlCiAg ICAgICAgIGZvciB0aHJlYWQgaW4gdGhyZWFkczoKICAgICAgICAgICAgICMgQ2hlY2sgd2hldGhl ciBhIFRlc3RTaGVsbFRocmVhZCBkaWVkIGJlZm9yZSBub3JtYWwgY29tcGxldGlvbi4KQEAgLTYx NCwxMCArNjEzLDYgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgIHJldHVybiAwCiAg ICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQogCi0gICAgICAgICMgU3RhcnQgdXAgYW55 IGhlbHBlciBuZWVkZWQKLSAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMubm9fcGl4ZWxfdGVz dHM6Ci0gICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X2hlbHBlcigpCi0KICAgICAgICAgaWYg c2VsZi5uZWVkc19odHRwKCk6CiAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0YXJ0X2h0dHBfc2Vy dmVyKCkKIApAQCAtNjQxLDcgKzYzNiw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAg ICBzZWxmLl9ydW5fdGVzdHMoZmFpbHVyZXMua2V5cygpLCByZXRyeV9zdW1tYXJ5KQogICAgICAg ICAgICAgZmFpbHVyZXMgPSBzZWxmLl9nZXRfZmFpbHVyZXMocmV0cnlfc3VtbWFyeSwgaW5jbHVk ZV9jcmFzaGVzPVRydWUpCiAKLSAgICAgICAgc2VsZi5fcG9ydC5zdG9wX2hlbHBlcigpCiAgICAg ICAgIGVuZF90aW1lID0gdGltZS50aW1lKCkKIAogICAgICAgICB3cml0ZSA9IGNyZWF0ZV9sb2dn aW5nX3dyaXRlcihzZWxmLl9vcHRpb25zLCAndGltaW5nJykKQEAgLTE0NjAsMTEgKzE0NTQsNiBA QCBkZWYgbWFpbihvcHRpb25zLCBhcmdzKToKICAgICAgICAgICAgICJsaW50IHN1Y2NlZWRlZC4i KQogICAgICAgICBzeXMuZXhpdCgwKQogCi0gICAgIyBDaGVjayB0aGF0IHRoZSBzeXN0ZW0gZGVw ZW5kZW5jaWVzICh0aGVtZXMsIGZvbnRzLCAuLi4pIGFyZSBjb3JyZWN0LgotICAgIGlmIG5vdCBv cHRpb25zLm5vY2hlY2tfc3lzX2RlcHM6Ci0gICAgICAgIGlmIG5vdCBwb3J0X29iai5jaGVja19z eXNfZGVwcyh0ZXN0X3J1bm5lci5uZWVkc19odHRwKCkpOgotICAgICAgICAgICAgc3lzLmV4aXQo MSkKLQogICAgIHdyaXRlID0gY3JlYXRlX2xvZ2dpbmdfd3JpdGVyKG9wdGlvbnMsICJjb25maWci KQogICAgIHdyaXRlKCJVc2luZyBwb3J0ICclcyciICUgcG9ydF9vYmoubmFtZSgpKQogICAgIHdy aXRlKCJQbGFjaW5nIHRlc3QgcmVzdWx0cyBpbiAlcyIgJSBvcHRpb25zLnJlc3VsdHNfZGlyZWN0 b3J5KQpAQCAtMTQ3OSw2ICsxNDY4LDEzIEBAIGRlZiBtYWluKG9wdGlvbnMsIGFyZ3MpOgogICAg IHRlc3RfcnVubmVyLnBhcnNlX2V4cGVjdGF0aW9ucyhwb3J0X29iai50ZXN0X3BsYXRmb3JtX25h bWUoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0aW9ucy50YXJnZXQg PT0gJ0RlYnVnJykKIAorICAgIHBvcnRfb2JqLnN0YXJ0X2hlbHBlcigpCisKKyAgICAjIENoZWNr IHRoYXQgdGhlIHN5c3RlbSBkZXBlbmRlbmNpZXMgKHRoZW1lcywgZm9udHMsIC4uLikgYXJlIGNv cnJlY3QuCisgICAgaWYgbm90IG9wdGlvbnMubm9jaGVja19zeXNfZGVwczoKKyAgICAgICAgaWYg bm90IHBvcnRfb2JqLmNoZWNrX3N5c19kZXBzKHRlc3RfcnVubmVyLm5lZWRzX2h0dHAoKSk6Cisg ICAgICAgICAgICBzeXMuZXhpdCgxKQorCiAgICAgbWV0ZXIudXBkYXRlKCJQcmVwYXJpbmcgdGVz dHMgLi4uIikKICAgICB3cml0ZSA9IGNyZWF0ZV9sb2dnaW5nX3dyaXRlcihvcHRpb25zLCAiZXhw ZWN0ZWQiKQogICAgIHJlc3VsdF9zdW1tYXJ5ID0gdGVzdF9ydW5uZXIucHJlcGFyZV9saXN0c19h bmRfcHJpbnRfb3V0cHV0KHdyaXRlKQpAQCAtMTQ5NCw2ICsxNDkwLDggQEAgZGVmIG1haW4ob3B0 aW9ucywgYXJncyk6CiAgICAgbWV0ZXIudXBkYXRlKCJTdGFydGluZyAuLi4iKQogICAgIGhhc19u ZXdfZmFpbHVyZXMgPSB0ZXN0X3J1bm5lci5ydW4ocmVzdWx0X3N1bW1hcnkpCiAKKyAgICBwb3J0 X29iai5zdG9wX2hlbHBlcigpCisKICAgICBsb2dnaW5nLmRlYnVnKCJFeGl0IHN0YXR1czogJWQi ICUgaGFzX25ld19mYWlsdXJlcykKICAgICBzeXMuZXhpdChoYXNfbmV3X2ZhaWx1cmVzKQogCg==