135624 2014-08-05 15:14:14 -0700 [iOS] Run ImageDiff in the sim bootstrap 2014-08-05 18:40:15 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) iPhone / iPad All RESOLVED FIXED P2 Normal --- 1 dfarler dfarler commit-queue dbates ddkilzer glenn simon.fraser oldest_to_newest 1026954 0 dfarler 2014-08-05 15:14:14 -0700 Previously, I tried to use ImageDiff on OS X without trying to go through the sim bootstrap. However, ImageDiff relies on some WTF functionality and I don't want to introduce a new OS X build dependency when testing iOS. I've verified that running ImageDiff in the sim bootstrap is negligible, so we can create a custom ImageDiffer and use that for the iso-simulator platform. With this change, the only OS X tool that you'll need to build is the LayoutTestRelay: there are no WebKit dependencies there and it builds automatically when running layout tests. 1026955 1 236050 dfarler 2014-08-05 15:20:52 -0700 Created attachment 236050 Patch 1026963 2 236054 dfarler 2014-08-05 15:29:41 -0700 Created attachment 236054 Patch 1026968 3 dfarler 2014-08-05 15:37:06 -0700 Sorry - uploaded a different patch to the same bug - reinstated original. 1027008 4 simon.fraser 2014-08-05 17:34:57 -0700 What does it mean to "run in the bootstrap"? Do you mean run in the simulated device? 1027013 5 dfarler 2014-08-05 17:52:10 -0700 Sort of, although not in a real SimDevice. It’s just wrapped in `xcrun -sdk iphonesimulator sim`. It has the bare minimum bootstrap to run a simulator binary but doesn’t have access to to other simulator services like the framebuffer, etc. It works in this case because it’s not a full UIKit application. 1027026 6 ddkilzer 2014-08-05 18:29:33 -0700 (In reply to comment #4) > What does it mean to "run in the bootstrap"? Do you mean run in the simulated device? It means that ImageDiff runs in the simulator environment, but not as an app in SpringBoard. In other words, it uses simulator frameworks instead of Mac OS X frameworks to run on the command line. 1027030 7 236050 ddkilzer 2014-08-05 18:35:18 -0700 Comment on attachment 236050 Patch r=me 1027035 8 dfarler 2014-08-05 18:40:15 -0700 Committed r172118: <http://trac.webkit.org/changeset/172118> 236050 2014-08-05 15:20:52 -0700 2014-08-05 18:35:18 -0700 Patch bug-135624-20140805152040.patch text/plain 3368 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uNWJhOGFiZmY3YTdjY2ZkY2Y1ZTMxNGRiZjczMDlmYTE1MmQ5YmIyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTA4LTA1ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAg ICAgICBbaU9TXSBSdW4gSW1hZ2VEaWZmIGluIHRoZSBzaW0gYm9vdHN0cmFwCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU2MjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1hZ2VEaWZmZXIuc3RvcCk6CisgICAgICAg IChJT1NTaW11bGF0b3JJbWFnZURpZmZlcik6CisgICAgICAgIChJT1NTaW11bGF0b3JJbWFnZURp ZmZlci5fc3RhcnQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6Cisg ICAgICAgIChJT1NTaW11bGF0b3JQb3J0LmRpZmZfaW1hZ2UpOgorCiAyMDE0LTA4LTA1ICBWaXZl ayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtndGtdIEluY2x1 ZGUgbGx2bS1kZXYoZWwpIHBhY2thZ2UgdG8gc2F0aXNmeSBtZXNhIGJ1aWxkIGNvbmZpZ3VyYXRp b24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkKaW5kZXggZmFlODlj N2QyYjZkNzYzZDRkZTY2MTU1NTcxZTgxYjEzNGRmY2UyYS4uMGNiMTRjMmEzZGIxOWM3MjljMmU0 NjVhMjU1MGY0ZDliMDM1MTJhMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2ltYWdlX2RpZmYucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdl X2RpZmYucHkKQEAgLTExMywzICsxMTMsMTMgQEAgY2xhc3MgSW1hZ2VEaWZmZXIob2JqZWN0KToK ICAgICAgICAgaWYgc2VsZi5fcHJvY2VzczoKICAgICAgICAgICAgIHNlbGYuX3Byb2Nlc3Muc3Rv cCgpCiAgICAgICAgICAgICBzZWxmLl9wcm9jZXNzID0gTm9uZQorCisKK2NsYXNzIElPU1NpbXVs YXRvckltYWdlRGlmZmVyKEltYWdlRGlmZmVyKToKKyAgICBkZWYgX3N0YXJ0KHNlbGYsIHRvbGVy YW5jZSk6CisgICAgICAgIGNvbW1hbmQgPSBbJ3hjcnVuJywgJy1zZGsnLCAnaXBob25lc2ltdWxh dG9yJywgJ3NpbScsICctLWVudmlyb25tZW50PXByZXNlcnZlJywgJy0tYWRvcHQtcGlkJywgc2Vs Zi5fcG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCksICctLXRvbGVyYW5jZScsIHN0cih0b2xlcmFu Y2UpXQorICAgICAgICBwcmludCAnICcuam9pbihjb21tYW5kKQorICAgICAgICBlbnZpcm9ubWVu dCA9IHNlbGYuX3BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKCdJbWFnZURpZmYnKQorICAg ICAgICBzZWxmLl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0 b3Ioc2VsZi5fcG9ydCwgJ0ltYWdlRGlmZicsIGNvbW1hbmQsIGVudmlyb25tZW50KQorICAgICAg ICBzZWxmLl9wcm9jZXNzLnN0YXJ0KCkKKyAgICAgICAgc2VsZi5fdG9sZXJhbmNlID0gdG9sZXJh bmNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQppbmRleCBiMjMyODk4Njk1ODViYzBhMzkx ZGI3ZGMyNDdjZDZhNDMxZjQxOTIwLi45ODQzMmMyMTMyNjExNjA0ZTM2YjE5NDgzMTM5ZDhiZDY1 MmIxOTZkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKQEAgLTMxLDcgKzMxLDcgQEAg aW1wb3J0IHN1YnByb2Nlc3MKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0 X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFzaExvZ3MKIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCi1mcm9tIHdlYmtpdHB5LnBv cnQgaW1wb3J0IGRyaXZlcgorZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBkcml2ZXIsIGltYWdl X2RpZmYKIGZyb20gd2Via2l0cHkucG9ydC5iYXNlIGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5 LnBvcnQubGVha2RldGVjdG9yIGltcG9ydCBMZWFrRGV0ZWN0b3IKIGZyb20gd2Via2l0cHkucG9y dCBpbXBvcnQgY29uZmlnIGFzIHBvcnRfY29uZmlnCkBAIC0zMzksNiArMzM5LDE4IEBAIGNsYXNz IElPU1NpbXVsYXRvclBvcnQoUG9ydCk6CiAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRl c3RIZWxwZXInCiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGJpbmFyeV9uYW1lKQog CisgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250 ZW50cywgdG9sZXJhbmNlPU5vbmUpOgorICAgICAgICBpZiBub3QgYWN0dWFsX2NvbnRlbnRzIGFu ZCBub3QgZXhwZWN0ZWRfY29udGVudHM6CisgICAgICAgICAgICByZXR1cm4gKE5vbmUsIDAsIE5v bmUpCisgICAgICAgIGlmIG5vdCBhY3R1YWxfY29udGVudHMgb3Igbm90IGV4cGVjdGVkX2NvbnRl bnRzOgorICAgICAgICAgICAgcmV0dXJuIChUcnVlLCAwLCBOb25lKQorICAgICAgICBpZiBub3Qg c2VsZi5faW1hZ2VfZGlmZmVyOgorICAgICAgICAgICAgc2VsZi5faW1hZ2VfZGlmZmVyID0gaW1h Z2VfZGlmZi5JT1NTaW11bGF0b3JJbWFnZURpZmZlcihzZWxmKQorICAgICAgICBzZWxmLnNldF9v cHRpb25fZGVmYXVsdCgndG9sZXJhbmNlJywgMC4xKQorICAgICAgICBpZiB0b2xlcmFuY2UgaXMg Tm9uZToKKyAgICAgICAgICAgIHRvbGVyYW5jZSA9IHNlbGYuZ2V0X29wdGlvbigndG9sZXJhbmNl JykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2ltYWdlX2RpZmZlci5kaWZmX2ltYWdlKGV4cGVjdGVk X2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZSkKKwogICAgIGRlZiByZXNldF9w cmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgc2ltdWxhdG9yX3BhdGggPSBzZWxmLnNpbXVsYXRv cl9wYXRoKHNlbGYuc2ltdWxhdG9yX3VkaWQoKSkKICAgICAgICAgaWYgbm90IHNpbXVsYXRvcl9w YXRoOgo= 236054 2014-08-05 15:29:41 -0700 2014-08-05 15:36:18 -0700 Patch bug-135624-20140805152929.patch text/plain 3368 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uNWJhOGFiZmY3YTdjY2ZkY2Y1ZTMxNGRiZjczMDlmYTE1MmQ5YmIyMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE0LTA4LTA1ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAg ICAgICBbaU9TXSBSdW4gSW1hZ2VEaWZmIGluIHRoZSBzaW0gYm9vdHN0cmFwCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU2MjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1hZ2VEaWZmZXIuc3RvcCk6CisgICAgICAg IChJT1NTaW11bGF0b3JJbWFnZURpZmZlcik6CisgICAgICAgIChJT1NTaW11bGF0b3JJbWFnZURp ZmZlci5fc3RhcnQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6Cisg ICAgICAgIChJT1NTaW11bGF0b3JQb3J0LmRpZmZfaW1hZ2UpOgorCiAyMDE0LTA4LTA1ICBWaXZl ayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtndGtdIEluY2x1 ZGUgbGx2bS1kZXYoZWwpIHBhY2thZ2UgdG8gc2F0aXNmeSBtZXNhIGJ1aWxkIGNvbmZpZ3VyYXRp b24KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkKaW5kZXggZmFlODlj N2QyYjZkNzYzZDRkZTY2MTU1NTcxZTgxYjEzNGRmY2UyYS4uMGNiMTRjMmEzZGIxOWM3MjljMmU0 NjVhMjU1MGY0ZDliMDM1MTJhMyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2ltYWdlX2RpZmYucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdl X2RpZmYucHkKQEAgLTExMywzICsxMTMsMTMgQEAgY2xhc3MgSW1hZ2VEaWZmZXIob2JqZWN0KToK ICAgICAgICAgaWYgc2VsZi5fcHJvY2VzczoKICAgICAgICAgICAgIHNlbGYuX3Byb2Nlc3Muc3Rv cCgpCiAgICAgICAgICAgICBzZWxmLl9wcm9jZXNzID0gTm9uZQorCisKK2NsYXNzIElPU1NpbXVs YXRvckltYWdlRGlmZmVyKEltYWdlRGlmZmVyKToKKyAgICBkZWYgX3N0YXJ0KHNlbGYsIHRvbGVy YW5jZSk6CisgICAgICAgIGNvbW1hbmQgPSBbJ3hjcnVuJywgJy1zZGsnLCAnaXBob25lc2ltdWxh dG9yJywgJ3NpbScsICctLWVudmlyb25tZW50PXByZXNlcnZlJywgJy0tYWRvcHQtcGlkJywgc2Vs Zi5fcG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCksICctLXRvbGVyYW5jZScsIHN0cih0b2xlcmFu Y2UpXQorICAgICAgICBwcmludCAnICcuam9pbihjb21tYW5kKQorICAgICAgICBlbnZpcm9ubWVu dCA9IHNlbGYuX3BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKCdJbWFnZURpZmYnKQorICAg ICAgICBzZWxmLl9wcm9jZXNzID0gc2VsZi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0 b3Ioc2VsZi5fcG9ydCwgJ0ltYWdlRGlmZicsIGNvbW1hbmQsIGVudmlyb25tZW50KQorICAgICAg ICBzZWxmLl9wcm9jZXNzLnN0YXJ0KCkKKyAgICAgICAgc2VsZi5fdG9sZXJhbmNlID0gdG9sZXJh bmNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQppbmRleCBiMjMyODk4Njk1ODViYzBhMzkx ZGI3ZGMyNDdjZDZhNDMxZjQxOTIwLi45ODQzMmMyMTMyNjExNjA0ZTM2YjE5NDgzMTM5ZDhiZDY1 MmIxOTZkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKQEAgLTMxLDcgKzMxLDcgQEAg aW1wb3J0IHN1YnByb2Nlc3MKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0 X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFzaExvZ3MKIGZyb20gd2Via2l0cHkuY29t bW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCi1mcm9tIHdlYmtpdHB5LnBv cnQgaW1wb3J0IGRyaXZlcgorZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBkcml2ZXIsIGltYWdl X2RpZmYKIGZyb20gd2Via2l0cHkucG9ydC5iYXNlIGltcG9ydCBQb3J0CiBmcm9tIHdlYmtpdHB5 LnBvcnQubGVha2RldGVjdG9yIGltcG9ydCBMZWFrRGV0ZWN0b3IKIGZyb20gd2Via2l0cHkucG9y dCBpbXBvcnQgY29uZmlnIGFzIHBvcnRfY29uZmlnCkBAIC0zMzksNiArMzM5LDE4IEBAIGNsYXNz IElPU1NpbXVsYXRvclBvcnQoUG9ydCk6CiAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRl c3RIZWxwZXInCiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGJpbmFyeV9uYW1lKQog CisgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250 ZW50cywgdG9sZXJhbmNlPU5vbmUpOgorICAgICAgICBpZiBub3QgYWN0dWFsX2NvbnRlbnRzIGFu ZCBub3QgZXhwZWN0ZWRfY29udGVudHM6CisgICAgICAgICAgICByZXR1cm4gKE5vbmUsIDAsIE5v bmUpCisgICAgICAgIGlmIG5vdCBhY3R1YWxfY29udGVudHMgb3Igbm90IGV4cGVjdGVkX2NvbnRl bnRzOgorICAgICAgICAgICAgcmV0dXJuIChUcnVlLCAwLCBOb25lKQorICAgICAgICBpZiBub3Qg c2VsZi5faW1hZ2VfZGlmZmVyOgorICAgICAgICAgICAgc2VsZi5faW1hZ2VfZGlmZmVyID0gaW1h Z2VfZGlmZi5JT1NTaW11bGF0b3JJbWFnZURpZmZlcihzZWxmKQorICAgICAgICBzZWxmLnNldF9v cHRpb25fZGVmYXVsdCgndG9sZXJhbmNlJywgMC4xKQorICAgICAgICBpZiB0b2xlcmFuY2UgaXMg Tm9uZToKKyAgICAgICAgICAgIHRvbGVyYW5jZSA9IHNlbGYuZ2V0X29wdGlvbigndG9sZXJhbmNl JykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2ltYWdlX2RpZmZlci5kaWZmX2ltYWdlKGV4cGVjdGVk X2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZSkKKwogICAgIGRlZiByZXNldF9w cmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgc2ltdWxhdG9yX3BhdGggPSBzZWxmLnNpbXVsYXRv cl9wYXRoKHNlbGYuc2ltdWxhdG9yX3VkaWQoKSkKICAgICAgICAgaWYgbm90IHNpbXVsYXRvcl9w YXRoOgo=