31870 2009-11-25 07:11:57 -0800 Add OutputCaputure class for sharing capture_output between unit tests 2009-11-25 07:46:17 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth commit-queue oldest_to_newest 166422 0 eric 2009-11-25 07:11:57 -0800 Add OutputCaputure class for sharing capture_output between unit tests 166426 1 43841 eric 2009-11-25 07:23:21 -0800 Created attachment 43841 Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests. 166428 2 43841 abarth 2009-11-25 07:28:22 -0800 Comment on attachment 43841 Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests. Looks good. I had sketched this out as a base class, but compositing is better. 166440 3 43841 commit-queue 2009-11-25 07:46:13 -0800 Comment on attachment 43841 Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests. Clearing flags on attachment: 43841 Committed r51381: <http://trac.webkit.org/changeset/51381> 166441 4 commit-queue 2009-11-25 07:46:17 -0800 All reviewed patches have been landed. Closing bug. 43841 2009-11-25 07:23:21 -0800 2009-11-25 07:46:12 -0800 Abstract out capturing stdout/stderr into a new OutputCapture class for re-use among the various unit tests. bug-31870-20091125102319.patch text/plain 7211 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmNzFkOGY3Li5lOGEwNDdhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDktMTEt MjUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFic3RyYWN0IG91dCBjYXB0dXJpbmcgc3Rkb3V0 L3N0ZGVyciBpbnRvIGEgbmV3IE91dHB1dENhcHR1cmUgY2xhc3MgZm9yIHJlLXVzZSBhbW9uZyB0 aGUgdmFyaW91cyB1bml0IHRlc3RzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzE4NzAKKworICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jb21tYW5k cy9xdWVyaWVzX3VuaXR0ZXN0LnB5OiBVc2UgdGhlIG5ldyBjbGFzcy4KKyAgICAgICAgKiBTY3Jp cHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbF91bml0dGVzdC5weTogRGl0dG8uCisgICAgICAg ICogU2NyaXB0cy9tb2R1bGVzL291dHB1dGNhcHR1cmUucHk6IEFkZGVkLgorCiAyMDA5LTExLTI0 ICBEbWl0cnkgVGl0b3YgIDxkaW1pY2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgU2VpZGVsLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L2NvbW1hbmRzL3F1ZXJpZXNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVs ZXMvY29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weQppbmRleCA2YmFlNzIyLi5kMDgxYzUyIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVlcmllc191 bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY29tbWFuZHMvcXVl cmllc191bml0dGVzdC5weQpAQCAtMjcsMzMgKzI3LDE3IEBACiAjIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGlt cG9ydCB1bml0dGVzdAotZnJvbSBTdHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSBtb2R1 bGVzLmNvbW1hbmRzLnF1ZXJpZXMgaW1wb3J0ICoKIGZyb20gbW9kdWxlcy5tb2NrX2J1Z3ppbGxh dG9vbCBpbXBvcnQgKgorZnJvbSBtb2R1bGVzLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENh cHR1cmUKIAogY2xhc3MgUXVlcnlDb21tYW5kc1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgotICAg IGRlZiBfY2FwdHVyZV9vdXRwdXRfd2l0aF9uYW1lKG91dHB1dF9uYW1lKToKLSAgICAgICAgc2Vs Zi5zYXZlZF9vdXRwdXRzW291dHB1dF9uYW1lXSA9IGdldGF0dHIoc3lzLCBvdXRwdXRfbmFtZSkK LSAgICAgICAgc2V0YXR0cihzeXMsIG91dHB1dF9uYW1lLCBTdHJpbmdJTy5TdHJpbmdJTygpKQot Ci0gICAgZGVmIF9yZWxlYXNlX291dHB1dF93aXRoX25hbWUob3V0cHV0X25hbWUpOgotICAgICAg ICBjYXB0dXJlZF9vdXRwdXQgPSBnZXRhdHRyKHN5cywgb3V0cHV0X25hbWUpLmdldHZhbHVlKCkK LSAgICAgICAgc2V0YXR0cihzeXMsIG91dHB1dF9uYW1lLCBzZWxmLnNhdmVkX291dHB1dHNbb3V0 cHV0X25hbWVdKQotICAgICAgICBkZWwgc2VsZi5zYXZlZF9vdXRwdXRzW291dHB1dF9uYW1lXQot ICAgICAgICByZXR1cm4gY2FwdHVyZWRfb3V0cHV0Ci0KLSAgICBkZWYgX2NhcHR1cmVfb3V0cHV0 KHNlbGYpOgotICAgICAgICBzZWxmLl9jYXB0dXJlX291dHB1dF93aXRoX25hbWUoInN0ZG91dCIp Ci0gICAgICAgIHNlbGYuX2NhcHR1cmVfb3V0cHV0X3dpdGhfbmFtZSgic3RkZXJyIikKLQotICAg IGRlZiBfcmVzdG9yZV9vdXRwdXQoc2VsZik6Ci0gICAgICAgIHJldHVybiAoc2VsZi5fcmVsZWFz ZV9vdXRwdXRfd2l0aF9uYW1lKCJzdGRvdXQiKSwgc2VsZi5fcmVsZWFzZV9vdXRwdXRfd2l0aF9u YW1lKCJzdGRlcnIiKSkKLQogICAgIGRlZiBfYXNzZXJ0X2V4ZWN1dGVfb3V0cHV0cyhzZWxmLCBj b21tYW5kLCBjb21tYW5kX2FyZ3MsIGV4cGVjdGVkX3N0ZG91dCwgZXhwZWN0ZWRfc3RkZXJyID0g IiIpOgotICAgICAgICBzZWxmLl9jYXB0dXJlX291dHB1dCgpCisgICAgICAgIGNhcHR1cmUgPSBP dXRwdXRDYXB0dXJlKCkKKyAgICAgICAgY2FwdHVyZS5jYXB0dXJlX291dHB1dCgpCiAgICAgICAg IGNvbW1hbmQuZXhlY3V0ZShOb25lLCBjb21tYW5kX2FyZ3MsIE1vY2tCdWd6aWxsYVRvb2woKSkK LSAgICAgICAgKHN0ZG91dF9zdHJpbmcsIHN0ZGVycl9zdHJpbmcpID0gc2VsZi5fcmVzdG9yZV9v dXRwdXQoKQorICAgICAgICAoc3Rkb3V0X3N0cmluZywgc3RkZXJyX3N0cmluZykgPSBjYXB0dXJl LnJlc3RvcmVfb3V0cHV0KCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdGRvdXRfc3RyaW5n LCBleHBlY3RlZF9zdGRvdXQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0ZWRfc3Rk ZXJyLCBleHBlY3RlZF9zdGRlcnIpCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRlc3QucHkKaW5kZXggZGJhZTkwOS4uYTdk NTllYyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFu ZHRvb2xfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRp Y29tbWFuZHRvb2xfdW5pdHRlc3QucHkKQEAgLTI5LDcgKzI5LDcgQEAKIGltcG9ydCBzeXMKIGlt cG9ydCB1bml0dGVzdAogZnJvbSBtdWx0aWNvbW1hbmR0b29sIGltcG9ydCBNdWx0aUNvbW1hbmRU b29sLCBDb21tYW5kCi1mcm9tIFN0cmluZ0lPIGltcG9ydCBTdHJpbmdJTworZnJvbSBtb2R1bGVz Lm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUKIAogZnJvbSBvcHRwYXJzZSBpbXBv cnQgbWFrZV9vcHRpb24KIApAQCAtNjYsMTYgKzY2LDYgQEAgY2xhc3MgVHJpdmlhbFRvb2woTXVs dGlDb21tYW5kVG9vbCk6CiAKIAogY2xhc3MgTXVsdGlDb21tYW5kVG9vbFRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgotICAgIGRlZiBfY2FwdHVyZV9zdGRlcnIoc2VsZik6Ci0gICAgICAgIHNlbGYu c2F2ZWRfc3RkZXJyID0gc3lzLnN0ZGVycgotICAgICAgICBzeXMuc3RkZXJyID0gU3RyaW5nSU8o KQotCi0gICAgZGVmIF9yZWxlYXNlX3N0ZGVycihzZWxmKToKLSAgICAgICAgc3RyaW5nID0gc3lz LnN0ZGVyci5nZXR2YWx1ZSgpCi0gICAgICAgIHN5cy5zdGRlcnIgPSBzZWxmLnNhdmVkX3N0ZGVy cgotICAgICAgICBzZWxmLnNhdmVkX3N0ZGVyciA9IE5vbmUKLSAgICAgICAgcmV0dXJuIHN0cmlu ZwotCiAgICAgZGVmIF9hc3NlcnRfc3BsaXQoc2VsZiwgYXJncywgZXhwZWN0ZWRfc3BsaXQpOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKE11bHRpQ29tbWFuZFRvb2wuX3NwbGl0X2FyZ3MoYXJn cyksIGV4cGVjdGVkX3NwbGl0KQogCkBAIC0xMDMsMTIgKzkzLDE0IEBAIGNsYXNzIE11bHRpQ29t bWFuZFRvb2xUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgY29tbWFuZF93aXRoX29w dGlvbnMgPSBUcml2aWFsQ29tbWFuZChvcHRpb25zPVttYWtlX29wdGlvbigiLS1teV9vcHRpb24i KV0pCiAgICAgICAgIHRvb2wgPSBUcml2aWFsVG9vbChjb21tYW5kcz1bY29tbWFuZF93aXRoX29w dGlvbnNdKQogCi0gICAgICAgIHNlbGYuX2NhcHR1cmVfc3RkZXJyKCkKKyAgICAgICAgY2FwdHVy ZSA9IE91dHB1dENhcHR1cmUoKQorICAgICAgICBjYXB0dXJlLmNhcHR1cmVfb3V0cHV0KCkKICAg ICAgICAgZXhpdF9jb2RlID0gdG9vbC5tYWluKFsidG9vbCIsICJoZWxwIiwgInRyaXZpYWwiXSkK LSAgICAgICAgaGVscF90ZXh0ID0gc2VsZi5fcmVsZWFzZV9zdGRlcnIoKQotICAgICAgICBleHBl Y3RlZF9zdWJjb21tYW5kX2hlbHAgPSAiICB0cml2aWFsIFtvcHRpb25zXSAgIGhlbHAgdGV4dFxu T3B0aW9uczpcbiAgLS1teV9vcHRpb249TVlfT1BUSU9OXG5cbiIKKyAgICAgICAgKHN0ZG91dF9z dHJpbmcsIHN0ZGVycl9zdHJpbmcpID0gY2FwdHVyZS5yZXN0b3JlX291dHB1dCgpCisgICAgICAg IGV4cGVjdGVkX3N1YmNvbW1hbmRfaGVscCA9ICJ0cml2aWFsIFtvcHRpb25zXSAgIGhlbHAgdGV4 dFxuT3B0aW9uczpcbiAgLS1teV9vcHRpb249TVlfT1BUSU9OXG5cbiIKICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChleGl0X2NvZGUsIDApCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaGVscF90 ZXh0LCBleHBlY3RlZF9zdWJjb21tYW5kX2hlbHApCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c3Rkb3V0X3N0cmluZywgIiIpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RkZXJyX3N0cmlu ZywgZXhwZWN0ZWRfc3ViY29tbWFuZF9oZWxwKQogCiAKIGlmIF9fbmFtZV9fID09ICJfX21haW5f XyI6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvb3V0cHV0Y2FwdHVy ZS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9vdXRwdXRjYXB0dXJlLnB5Cm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmYwMmZjNWQKLS0tIC9kZXYvbnVsbAorKysg Yi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvb3V0cHV0Y2FwdHVyZS5weQpAQCAtMCwwICsx LDUzIEBACisjIENvcHlyaWdodCAoYykgMjAwOSwgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIyAKKyMgICAg ICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyMgaW4gdGhlIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZQorIyBkaXN0 cmlidXRpb24uCisjICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRo ZSBuYW1lcyBvZiBpdHMKKyMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3Ig cHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkIGZyb20KKyMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNw ZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyMgCisjIFRISVMgU09GVFdBUkUgSVMg UFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKKyMgIkFT IElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJV VCBOT1QKKyMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFC SUxJVFkgQU5EIEZJVE5FU1MgRk9SCisjIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisjIE9XTkVSIE9SIENPTlRSSUJV VE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorIyBT UEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UCisjIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1Ig U0VSVklDRVM7IExPU1MgT0YgVVNFLAorIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyMgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VU IE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyMKKyMgQ2xhc3MgZm9yIHVuaXR0ZXN0IHN1cHBv cnQuICBVc2VkIGZvciBjYXB0dXJpbmcgc3RkZXJyL3N0ZG91dC4KKworaW1wb3J0IHN5cworZnJv bSBTdHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KKworY2xhc3MgT3V0cHV0Q2FwdHVyZShvYmplY3Qp OgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgc2VsZi5zYXZlZF9vdXRwdXRzID0g ZGljdCgpCisKKyAgICBkZWYgX2NhcHR1cmVfb3V0cHV0X3dpdGhfbmFtZShzZWxmLCBvdXRwdXRf bmFtZSk6CisgICAgICAgIHNlbGYuc2F2ZWRfb3V0cHV0c1tvdXRwdXRfbmFtZV0gPSBnZXRhdHRy KHN5cywgb3V0cHV0X25hbWUpCisgICAgICAgIHNldGF0dHIoc3lzLCBvdXRwdXRfbmFtZSwgU3Ry aW5nSU8oKSkKKworICAgIGRlZiBfcmVzdG9yZV9vdXRwdXRfd2l0aF9uYW1lKHNlbGYsIG91dHB1 dF9uYW1lKToKKyAgICAgICAgY2FwdHVyZWRfb3V0cHV0ID0gZ2V0YXR0cihzeXMsIG91dHB1dF9u YW1lKS5nZXR2YWx1ZSgpCisgICAgICAgIHNldGF0dHIoc3lzLCBvdXRwdXRfbmFtZSwgc2VsZi5z YXZlZF9vdXRwdXRzW291dHB1dF9uYW1lXSkKKyAgICAgICAgZGVsIHNlbGYuc2F2ZWRfb3V0cHV0 c1tvdXRwdXRfbmFtZV0KKyAgICAgICAgcmV0dXJuIGNhcHR1cmVkX291dHB1dAorCisgICAgZGVm IGNhcHR1cmVfb3V0cHV0KHNlbGYpOgorICAgICAgICBzZWxmLl9jYXB0dXJlX291dHB1dF93aXRo X25hbWUoInN0ZG91dCIpCisgICAgICAgIHNlbGYuX2NhcHR1cmVfb3V0cHV0X3dpdGhfbmFtZSgi c3RkZXJyIikKKworICAgIGRlZiByZXN0b3JlX291dHB1dChzZWxmKToKKyAgICAgICAgcmV0dXJu IChzZWxmLl9yZXN0b3JlX291dHB1dF93aXRoX25hbWUoInN0ZG91dCIpLCBzZWxmLl9yZXN0b3Jl X291dHB1dF93aXRoX25hbWUoInN0ZGVyciIpKQo=