136486 2014-09-03 10:37:23 -0700 [Win] Revise test environment for Windows build 2014-09-03 13:12:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dbates ddkilzer oldest_to_newest 1032925 0 bfulgham 2014-09-03 10:37:23 -0700 The Windows build and test system has some cruft that needs to be cleaned up: 1. DRT and friends know how to find 64-bit runtimes, so the special cases in webkitdirs.pm should be removed. 2. We don't need to look for Safari.exe on Windows to run tests, and shouldn't complain if we don't find it. 3. Where possible, we should use File::Spec for file handling so that we can be agnostic about whether the tests are being run under Cygwin or not. 1032934 1 237562 bfulgham 2014-09-03 11:09:38 -0700 Created attachment 237562 Patch 1032938 2 bfulgham 2014-09-03 11:15:37 -0700 *** Bug 125180 has been marked as a duplicate of this bug. *** 1032983 3 bfulgham 2014-09-03 13:01:15 -0700 I didn't actually make any File::Spec changes here. That will be coming in a separate change. 1032985 4 237562 ddkilzer 2014-09-03 13:05:58 -0700 Comment on attachment 237562 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237562&action=review r=me > Tools/Scripts/webkitdirs.pm:765 > + die "Safari Path is only relevant on Mac platform\n" unless isAppleMacWebKit(); Nit: Lowercase "Path"? Maybe say instead: die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit(); > Tools/Scripts/webkitdirs.pm:784 > + die "Safari Path is only relevant on Mac platform\n" unless isAppleMacWebKit(); Same: die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit(); 1032990 5 bfulgham 2014-09-03 13:12:43 -0700 Committed r173219: <http://trac.webkit.org/changeset/173219> 237562 2014-09-03 11:09:38 -0700 2014-09-03 13:05:58 -0700 Patch bug-136486-20140903111040.patch text/plain 6520 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MzIxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE0LTA5LTAzICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIFJldmlzZSB0ZXN0IGVudmlyb25tZW50IGZvciBXaW5kb3dzIGJ1 aWxkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2 NDg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHZhcmlvdXMgY2FsbHMgdG8gZ2V0IHRoZSBTYWZhcmkgcGF0aCByZWFsbHkgb25seSBoYXZlCisg ICAgICAgIG1lYW5pbmcgb24gdGhlIE1hYy4gT3RoZXIgcG9ydHMgZ2V0IGFjY2VzcyB0byB0aGUg YnVpbGQKKyAgICAgICAgYW5kIHRlc3QgZW52aXJvbm1lbnQgc2VwYXJhdGVseSwgc28gcmVtb3Zl IHRoZSB2YXJpb3VzCisgICAgICAgIGNoZWNrcyBpbiB0aGUgU2FmYXJpLXNwZWNpZmljIGNvZGUg dG8gc2ltcGxpZnkgdGhpbmdzLgorCisgICAgICAgIFJlbW92ZSBzb21lIDY0LWJpdCBoYWNrcyB1 c2VkIG9uIFdpbmRvd3Mgbm93IHRoYXQgdGhlCisgICAgICAgIHZhcmlvdXMgdG9vbHMga25vdyBo b3cgdG8gZmluZCB0aGUgNjQtYml0IHJ1bnRpbWUgZW52aXJvbm1lbnQuCisKKyAgICAgICAgKiBT Y3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0czogCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRkaXJzLnBtOgorICAgICAgICAoc2FmYXJpUGF0aEZyb21TYWZhcmlCdW5kbGUpOiBSZXZpc2Ug dG8gZXhwZWN0IE1hYy4KKyAgICAgICAgKGluc3RhbGxlZFNhZmFyaVBhdGgpOiBEaXR0by4KKyAg ICAgICAgKHNhZmFyaVBhdGgpOiBEaXR0by4KKyAgICAgICAgKGFwcGxlQXBwbGljYXRpb25TdXBw b3J0UGF0aCk6IEdldCByaWQgb2YgNjQtYml0IFdpbmRvd3MgaGFjay4KKyAgICAgICAgKHNldFBh dGhGb3JSdW5uaW5nV2ViS2l0QXBwKTogR2V0IHJpZCBvZiB1bnVzZWQgU2FmYXJpUGF0aAorICAg ICAgICBhcmd1bWVudCBmb3IgV2luZG93cyBydW5zLgorCiAyMDE0LTA5LTAzICBEYW5hIEJ1cmth cnQgIDxkYnVya2FydEBhcHBsZS5jb20+CiAKICAgICAgICAgRGFzaGJvYXJkIHNob3VsZCBzaG93 IHBlcmZvcm1hbmNlIGJvdHMuCkluZGV4OiBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29y ZS10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10 ZXN0cwkocmV2aXNpb24gMTczMjA2KQorKysgVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNv cmUtdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTEsNiArMSw2IEBACiAjIS91c3IvYmluL3Blcmwg LXcKIAotIyBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMTMgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA1LCAyMDEzLTIwMTQgQXBwbGUgSW5jLiAgQWxs IHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChDKSAyMDA3IEVyaWMgU2VpZGVsIDxlcmlj QHdlYmtpdC5vcmc+CiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtMTY1LDcgKzE2NSw5IEBAIGlmICgkcnVu VGVzdEFQSSkgewogICAgICMgVXNlIGFuICJpbmRpcmVjdCBvYmplY3QiIHNvIHRoYXQgc3lzdGVt KCkgd29uJ3QgZ2V0IGNvbmZ1c2VkIGlmIHRoZSBwYXRoCiAgICAgIyBjb250YWlucyBzcGFjZXMg KHNlZSBwZXJsZG9jIC1mIGV4ZWMpLgogICAgIG15ICR0ZXN0YXBpUmVzdWx0ID0gc3lzdGVtIHsg JGNvbW1hbmRbMF0gfSBAY29tbWFuZDsKLSAgICBleGl0IGV4aXRTdGF0dXMoJHRlc3RhcGlSZXN1 bHQpICBpZiAkdGVzdGFwaVJlc3VsdDsKKyAgICBteSAkZXhpdFN0YXR1cyA9IGV4aXRTdGF0dXMo JHRlc3RhcGlSZXN1bHQpOworICAgIHByaW50ICJ0ZXN0QVBJIGNvbXBsZXRlZCB3aXRoIHJjPSR0 ZXN0YXBpUmVzdWx0ICgkZXhpdFN0YXR1cylcbiI7CisgICAgZXhpdCBleGl0U3RhdHVzKCR0ZXN0 YXBpUmVzdWx0KSBpZiAkdGVzdGFwaVJlc3VsdDsKIH0KIAogIyBGaW5kIEphdmFTY3JpcHRDb3Jl IGRpcmVjdG9yeQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTczMjA2KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC03NjIsNjEgKzc2Miw0 MSBAQCBzdWIgc2FmYXJpUGF0aEZyb21TYWZhcmlCdW5kbGUKIHsKICAgICBteSAoJHNhZmFyaUJ1 bmRsZSkgPSBAXzsKIAotICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKLSAgICAgICAgbXkg JHNhZmFyaVBhdGggPSAiJHNhZmFyaUJ1bmRsZS9Db250ZW50cy9NYWNPUy9TYWZhcmkiOwotICAg ICAgICByZXR1cm4gJHNhZmFyaVBhdGggaWYgc2tpcFNhZmFyaUV4ZWN1dGFibGVFbnRpdGxlbWVu dENoZWNrcygpOworICAgIGRpZSAiU2FmYXJpIFBhdGggaXMgb25seSByZWxldmFudCBvbiBNYWMg cGxhdGZvcm1cbiIgdW5sZXNzIGlzQXBwbGVNYWNXZWJLaXQoKTsKIAotICAgICAgICBteSAkc2Fm YXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnRQYXRoID0gIiRzYWZhcmlCdW5kbGUvQ29udGVudHMvTWFj T1MvU2FmYXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnQiOwotICAgICAgICByZXR1cm4gJHNhZmFyaUZv cldlYktpdERldmVsb3BtZW50UGF0aCBpZiAtZiAkc2FmYXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnRQ YXRoICYmIGV4ZWN1dGFibGVIYXNFbnRpdGxlbWVudHMoJHNhZmFyaVBhdGgpOworICAgIG15ICRz YWZhcmlQYXRoID0gIiRzYWZhcmlCdW5kbGUvQ29udGVudHMvTWFjT1MvU2FmYXJpIjsKKyAgICBy ZXR1cm4gJHNhZmFyaVBhdGggaWYgc2tpcFNhZmFyaUV4ZWN1dGFibGVFbnRpdGxlbWVudENoZWNr cygpOwogCi0gICAgICAgIHJldHVybiAkc2FmYXJpUGF0aDsKLSAgICB9Ci0gICAgcmV0dXJuICRz YWZhcmlCdW5kbGUgaWYgaXNBcHBsZVdpbldlYktpdCgpOworICAgIG15ICRzYWZhcmlGb3JXZWJL aXREZXZlbG9wbWVudFBhdGggPSAiJHNhZmFyaUJ1bmRsZS9Db250ZW50cy9NYWNPUy9TYWZhcmlG b3JXZWJLaXREZXZlbG9wbWVudCI7CisgICAgcmV0dXJuICRzYWZhcmlGb3JXZWJLaXREZXZlbG9w bWVudFBhdGggaWYgLWYgJHNhZmFyaUZvcldlYktpdERldmVsb3BtZW50UGF0aCAmJiBleGVjdXRh YmxlSGFzRW50aXRsZW1lbnRzKCRzYWZhcmlQYXRoKTsKKworICAgIHJldHVybiAkc2FmYXJpUGF0 aDsKIH0KIAogc3ViIGluc3RhbGxlZFNhZmFyaVBhdGgKIHsKLSAgICBteSAkc2FmYXJpQnVuZGxl OwotCi0gICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewotICAgICAgICAkc2FmYXJpQnVuZGxl ID0gIi9BcHBsaWNhdGlvbnMvU2FmYXJpLmFwcCI7Ci0gICAgfSBlbHNpZiAoaXNBcHBsZVdpbldl YktpdCgpKSB7Ci0gICAgICAgICRzYWZhcmlCdW5kbGUgPSByZWFkUmVnaXN0cnlTdHJpbmcoIi9I S0xNL1NPRlRXQVJFL0FwcGxlIEluYy4vU2FmYXJpL0luc3RhbGxEaXIiKTsKLSAgICAgICAgJHNh ZmFyaUJ1bmRsZSA9fiBzL1tcclxuXSskLy87Ci0gICAgICAgICRzYWZhcmlCdW5kbGUgPSBgY3ln cGF0aCAtdSAnJHNhZmFyaUJ1bmRsZSdgIGlmIGlzQ3lnd2luKCk7Ci0gICAgICAgICRzYWZhcmlC dW5kbGUgPX4gcy9bXHJcbl0rJC8vOwotICAgICAgICAkc2FmYXJpQnVuZGxlIC49ICJTYWZhcmku ZXhlIjsKLSAgICB9Ci0KLSAgICByZXR1cm4gc2FmYXJpUGF0aEZyb21TYWZhcmlCdW5kbGUoJHNh ZmFyaUJ1bmRsZSk7CisgICAgcmV0dXJuIHNhZmFyaVBhdGhGcm9tU2FmYXJpQnVuZGxlKCIvQXBw bGljYXRpb25zL1NhZmFyaS5hcHAiKTsKIH0KIAogIyBMb2NhdGUgU2FmYXJpLgogc3ViIHNhZmFy aVBhdGgKIHsKKyAgICBkaWUgIlNhZmFyaSBQYXRoIGlzIG9ubHkgcmVsZXZhbnQgb24gTWFjIHBs YXRmb3JtXG4iIHVubGVzcyBpc0FwcGxlTWFjV2ViS2l0KCk7CisKICAgICAjIFVzZSBXRUJLSVRf U0FGQVJJIGVudmlyb25tZW50IHZhcmlhYmxlIGlmIHByZXNlbnQuCiAgICAgbXkgJHNhZmFyaUJ1 bmRsZSA9ICRFTlZ7V0VCS0lUX1NBRkFSSX07CiAgICAgaWYgKCEkc2FmYXJpQnVuZGxlKSB7CiAg ICAgICAgIGRldGVybWluZUNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyKCk7CiAgICAgICAgICMgVXNl IFNhZmFyaS5hcHAgaW4gcHJvZHVjdCBkaXJlY3RvcnkgaWYgcHJlc2VudCAoZ29vZCBmb3IgU2Fm YXJpIGRldmVsb3BtZW50IHRlYW0pLgotICAgICAgICBpZiAoaXNBcHBsZU1hY1dlYktpdCgpICYm IC1kICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvU2FmYXJpLmFwcCIpIHsKKyAgICAgICAgaWYg KC1kICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvU2FmYXJpLmFwcCIpIHsKICAgICAgICAgICAg ICRzYWZhcmlCdW5kbGUgPSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL1NhZmFyaS5hcHAiOwot ICAgICAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKLSAgICAgICAgICAgIG15ICRw YXRoID0gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci9TYWZhcmkuZXhlIjsKLSAgICAgICAgICAg IG15ICRkZWJ1Z1BhdGggPSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL1NhZmFyaV9kZWJ1Zy5l eGUiOwotCi0gICAgICAgICAgICBpZiAoY29uZmlndXJhdGlvbigpIGVxICJEZWJ1Z19BbGwiICYm IC14ICRkZWJ1Z1BhdGgpIHsKLSAgICAgICAgICAgICAgICAkc2FmYXJpQnVuZGxlID0gJGRlYnVn UGF0aDsKLSAgICAgICAgICAgIH0gZWxzaWYgKC14ICRwYXRoKSB7Ci0gICAgICAgICAgICAgICAg JHNhZmFyaUJ1bmRsZSA9ICRwYXRoOwotICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAg IGlmICghJHNhZmFyaUJ1bmRsZSkgewogICAgICAgICAgICAgcmV0dXJuIGluc3RhbGxlZFNhZmFy aVBhdGgoKTsKICAgICAgICAgfQogICAgIH0KICAgICBteSAkc2FmYXJpUGF0aCA9IHNhZmFyaVBh dGhGcm9tU2FmYXJpQnVuZGxlKCRzYWZhcmlCdW5kbGUpOwotICAgIGRpZSAiQ2FuJ3QgZmluZCBl eGVjdXRhYmxlIGF0ICRzYWZhcmlQYXRoLlxuIiBpZiBpc0FwcGxlTWFjV2ViS2l0KCkgJiYgIS14 ICRzYWZhcmlQYXRoOworICAgIGRpZSAiQ2FuJ3QgZmluZCBleGVjdXRhYmxlIGF0ICRzYWZhcmlQ YXRoLlxuIiBpZiAhLXggJHNhZmFyaVBhdGg7CiAgICAgcmV0dXJuICRzYWZhcmlQYXRoOwogfQog CkBAIC0xOTk3LDExICsxOTc3LDYgQEAgc3ViIHByb21wdFVzZXIKIAogc3ViIGFwcGxlQXBwbGlj YXRpb25TdXBwb3J0UGF0aAogewotICAgIGlmIChpc1dpbjY0KCkpIHsKLSAgICAgICAgIyBGSVhN RSAoMTI1MTgwKTogUmVtb3ZlIHRoZSBmb2xsb3dpbmcgb25jZSBvZmZpY2lhbCA2NC1iaXQgV2lu ZG93cyBzdXBwb3J0IGlzIGF2YWlsYWJsZS4KLSAgICAgICAgcmV0dXJuICRFTlZ7IldFQktJVF82 NF9TVVBQT1JUIn0sICJcbiIgaWYgaXNXaW42NCgpOwotICAgIH0KLQogICAgIG9wZW4gSU5TVEFM TF9ESVIsICI8L3Byb2MvcmVnaXN0cnkvSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJFL0FwcGxl XCBJbmMuL0FwcGxlXCBBcHBsaWNhdGlvblwgU3VwcG9ydC9JbnN0YWxsRGlyIjsKICAgICBteSAk cGF0aCA9IDxJTlNUQUxMX0RJUj47CiAgICAgJHBhdGggPX4gcy9bXHJcblx4MDBdLiovLzsKQEAg LTIwMTcsNyArMTk5Miw3IEBAIHN1YiBzZXRQYXRoRm9yUnVubmluZ1dlYktpdEFwcAogICAgIG15 ICgkZW52KSA9IEBfOwogCiAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewotICAgICAgICAk ZW52LT57UEFUSH0gPSBqb2luKCc6JywgcHJvZHVjdERpcigpLCBkaXJuYW1lKGluc3RhbGxlZFNh ZmFyaVBhdGgoKSksIGFwcGxlQXBwbGljYXRpb25TdXBwb3J0UGF0aCgpLCAkZW52LT57UEFUSH0g fHwgIiIpOworICAgICAgICAkZW52LT57UEFUSH0gPSBqb2luKCc6JywgcHJvZHVjdERpcigpLCBh cHBsZUFwcGxpY2F0aW9uU3VwcG9ydFBhdGgoKSwgJGVudi0+e1BBVEh9IHx8ICIiKTsKICAgICB9 IGVsc2lmIChpc1dpbkNhaXJvKCkpIHsKICAgICAgICAgbXkgJHdpbkNhaXJvQmluID0gc291cmNl RGlyKCkgLiAiL1dlYktpdExpYnJhcmllcy93aW4vIiAuIChpc1dpbjY0KCkgPyAiYmluNjQvIiA6 ICJiaW4zMi8iKTsKICAgICAgICAgbXkgJGdzdHJlYW1lckJpbiA9IGlzV2luNjQoKSA/ICRFTlZ7 IkdTVFJFQU1FUl8xXzBfUk9PVF9YODZfNjQifSAuICJiaW4iIDogJEVOVnsiR1NUUkVBTUVSXzFf MF9ST09UX1g4NiJ9IC4gImJpbiI7Cg==