120870 2013-09-06 11:33:22 -0700 GTest: add support for FreeBSD and Hurd 2013-09-09 02:48:01 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 berto webkit-unassigned commit-queue gustavo pochu27 zan oldest_to_newest 925736 0 berto 2013-09-06 11:33:22 -0700 This is necessary for the FreeBSD and Hurd builds. 925737 1 210775 berto 2013-09-06 11:34:38 -0700 Created attachment 210775 Patch 925738 2 commit-queue 2013-09-06 11:37:18 -0700 Attachment 210775 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/ThirdParty/ChangeLog', u'Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h']" exit_code: 1 Source/ThirdParty/gtest/include/gtest/internal/gtest-port.h:499: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 925739 3 berto 2013-09-06 11:39:43 -0700 (In reply to comment #2) > Attachment 210775 [details] did not pass style-queue: That's the second line here: -#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ +#if (GTEST_OS_LINUX || GTEST_OS_FREEBSD || GTEST_OS_HURD || \ + GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX) I decided to keep the same spacing as the rest of the expression, I guess that's what makes sense here? 925742 4 pochu27 2013-09-06 11:41:38 -0700 (In reply to comment #3) > (In reply to comment #2) > > Attachment 210775 [details] [details] did not pass style-queue: > > That's the second line here: > > -#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ > +#if (GTEST_OS_LINUX || GTEST_OS_FREEBSD || GTEST_OS_HURD || \ > + GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ > (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ > GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX) > > I decided to keep the same spacing as the rest of the expression, I > guess that's what makes sense here? gtest is an external project so we shouldn't follow webkit's style but be consistent with the rest of the file AFAIK. Thanks for submitting this upstream! 925743 5 zan 2013-09-06 11:42:36 -0700 (In reply to comment #3) > (In reply to comment #2) > > Attachment 210775 [details] [details] did not pass style-queue: > > That's the second line here: > > -#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ > +#if (GTEST_OS_LINUX || GTEST_OS_FREEBSD || GTEST_OS_HURD || \ > + GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \ > (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \ > GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX) > > I decided to keep the same spacing as the rest of the expression, I > guess that's what makes sense here? This is a third-party source code, so we shouldn't really enforce WebKit style guidelines in there. 925749 6 zan 2013-09-06 11:46:46 -0700 (In reply to comment #4) > gtest is an external project so we shouldn't follow webkit's style but be consistent with the rest of the file AFAIK. Didn't see that, sorry for the extra noise. 925811 7 210775 gustavo 2013-09-06 13:19:10 -0700 Comment on attachment 210775 Patch Should probably submit that to Google, so it's not lost when it's synced from there? 925824 8 berto 2013-09-06 13:30:26 -0700 Committed r155210: <http://trac.webkit.org/changeset/155210> 926612 9 berto 2013-09-09 02:33:23 -0700 (In reply to comment #7) > (From update of attachment 210775 [details]) > Should probably submit that to Google, so it's not lost when it's synced from there? I guess so, what do you think Emilio? 926622 10 pochu27 2013-09-09 02:48:01 -0700 Absolutely. Upstream is at https://code.google.com/p/googletest/source/browse/trunk/include/gtest/internal/gtest-port.h I can have a look at it later this week, but feel free to beat me to it. 210775 2013-09-06 11:34:38 -0700 2013-09-06 13:19:10 -0700 Patch 120870.diff text/plain 3302 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0NoYW5nZUxvZyBiL1NvdXJjZS9UaGlyZFBh cnR5L0NoYW5nZUxvZwppbmRleCA3MzhmOWY4Li5iZjdkY2U2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTMtMDktMDYgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlh LmNvbT4KKworICAgICAgICBHVGVzdDogYWRkIHN1cHBvcnQgZm9yIEZyZWVCU0QgYW5kIEh1cmQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDg3MAor CisgICAgICAgIFBhdGNoIGJ5IEVtaWxpbyBQb3p1ZWxvIE1vbmZvcnQgPHBvY2h1QGRlYmlhbi5v cmc+CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZ3Rl c3QvaW5jbHVkZS9ndGVzdC9pbnRlcm5hbC9ndGVzdC1wb3J0Lmg6CisKIDIwMTMtMDktMDUgIEFu ZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUgQysr MTEgd2hlcmV2ZXIgd2UgYnVpbGQgQysrIGZpbGVzIHRoYXQgaW5jbHVkZSB3dGYvUGxhdGZvcm0u aApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvZ3Rlc3QvaW5jbHVkZS9ndGVzdC9pbnRl cm5hbC9ndGVzdC1wb3J0LmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNsdWRlL2d0ZXN0 L2ludGVybmFsL2d0ZXN0LXBvcnQuaAppbmRleCBjNGFmOTE2Li5lOGM2YWUwIDEwMDY0NAotLS0g YS9Tb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNsdWRlL2d0ZXN0L2ludGVybmFsL2d0ZXN0LXBv cnQuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9ndGVzdC9pbmNsdWRlL2d0ZXN0L2ludGVybmFs L2d0ZXN0LXBvcnQuaApAQCAtODEsNiArODEsOCBAQAogLy8gICBHVEVTVF9PU19BSVggICAgICAt IElCTSBBSVgKIC8vICAgR1RFU1RfT1NfQ1lHV0lOICAgLSBDeWd3aW4KIC8vICAgR1RFU1RfT1Nf TElOVVggICAgLSBMaW51eAorLy8gICBHVEVTVF9PU19GUkVFQlNEICAtIEZyZWVCU0QKKy8vICAg R1RFU1RfT1NfSFVSRCAgICAgLSBHTlUvSHVyZAogLy8gICBHVEVTVF9PU19NQUMgICAgICAtIE1h YyBPUyBYCiAvLyAgIEdURVNUX09TX1NPTEFSSVMgIC0gU3VuIFNvbGFyaXMKIC8vICAgR1RFU1Rf T1NfU1lNQklBTiAgLSBTeW1iaWFuCkBAIC0yMTksNiArMjIxLDEwIEBACiAjZGVmaW5lIEdURVNU X09TX01BQyAxCiAjZWxpZiBkZWZpbmVkIF9fbGludXhfXwogI2RlZmluZSBHVEVTVF9PU19MSU5V WCAxCisjZWxpZiBkZWZpbmVkIF9fR05VX18KKyNkZWZpbmUgR1RFU1RfT1NfSFVSRCAxCisjZWxp ZiBkZWZpbmVkKF9fRnJlZUJTRF9fKSB8fCBkZWZpbmVkKF9fRHJhZ29uRmx5X18pIHx8IGRlZmlu ZWQoX19GcmVlQlNEX2tlcm5lbF9fKQorI2RlZmluZSBHVEVTVF9PU19GUkVFQlNEIDEKICNlbGlm IGRlZmluZWQgX19NVlNfXwogI2RlZmluZSBHVEVTVF9PU19aT1MgMQogI2VsaWYgZGVmaW5lZChf X3N1bikgJiYgZGVmaW5lZChfX1NWUjQpCkBAIC0yMjgsNyArMjM0LDcgQEAKICNlbmRpZiAgLy8g X19DWUdXSU5fXwogCiAjaWYgR1RFU1RfT1NfQ1lHV0lOIHx8IEdURVNUX09TX0xJTlVYIHx8IEdU RVNUX09TX01BQyB8fCBHVEVTVF9PU19TWU1CSUFOIHx8IFwKLSAgICBHVEVTVF9PU19TT0xBUklT IHx8IEdURVNUX09TX0FJWAorICAgIEdURVNUX09TX1NPTEFSSVMgfHwgR1RFU1RfT1NfQUlYIHx8 IEdURVNUX09TX0ZSRUVCU0QgfHwgR1RFU1RfT1NfSFVSRAogCiAvLyBPbiBzb21lIHBsYXRmb3Jt cywgPHJlZ2V4Lmg+IG5lZWRzIHNvbWVvbmUgdG8gZGVmaW5lIHNpemVfdCwgYW5kCiAvLyB3b24n dCBjb21waWxlIG90aGVyd2lzZS4gIFdlIGNhbiAjaW5jbHVkZSBpdCBoZXJlIGFzIHdlIGFscmVh ZHkKQEAgLTI2MCw3ICsyNjYsOCBAQAogI2RlZmluZSBHVEVTVF9VU0VTX1NJTVBMRV9SRSAxCiAK ICNlbmRpZiAgLy8gR1RFU1RfT1NfQ1lHV0lOIHx8IEdURVNUX09TX0xJTlVYIHx8IEdURVNUX09T X01BQyB8fAotICAgICAgICAvLyBHVEVTVF9PU19TWU1CSUFOIHx8IEdURVNUX09TX1NPTEFSSVMg fHwgR1RFU1RfT1NfQUlYCisgICAgICAgIC8vIEdURVNUX09TX1NZTUJJQU4gfHwgR1RFU1RfT1Nf U09MQVJJUyB8fCBHVEVTVF9PU19BSVggfHwKKyAgICAgICAgLy8gR1RFU1RfT1NfRlJFRUJTRCB8 fCBHVEVTVF9PU19IVVJECiAKICNpZm5kZWYgR1RFU1RfSEFTX0VYQ0VQVElPTlMKIC8vIFRoZSB1 c2VyIGRpZG4ndCB0ZWxsIHVzIHdoZXRoZXIgZXhjZXB0aW9ucyBhcmUgZW5hYmxlZCwgc28gd2Ug bmVlZApAQCAtMzgyLDcgKzM4OSw3IEBACiAvLwogLy8gVG8gZGlzYWJsZSB0aHJlYWRpbmcgc3Vw cG9ydCBpbiBHb29nbGUgVGVzdCwgYWRkIC1ER1RFU1RfSEFTX1BUSFJFQUQ9MAogLy8gdG8geW91 ciBjb21waWxlciBmbGFncy4KLSNkZWZpbmUgR1RFU1RfSEFTX1BUSFJFQUQgKEdURVNUX09TX0xJ TlVYIHx8IEdURVNUX09TX01BQykKKyNkZWZpbmUgR1RFU1RfSEFTX1BUSFJFQUQgKEdURVNUX09T X0xJTlVYIHx8IEdURVNUX09TX0ZSRUVCU0QgfHwgR1RFU1RfT1NfSFVSRCB8fCBHVEVTVF9PU19N QUMpCiAjZW5kaWYgIC8vIEdURVNUX0hBU19QVEhSRUFECiAKIC8vIERldGVybWluZXMgd2hldGhl ciBHb29nbGUgVGVzdCBjYW4gdXNlIHRyMS90dXBsZS4gIFlvdSBjYW4gZGVmaW5lCkBAIC00ODgs NyArNDk1LDggQEAKIC8vIEdvb2dsZSBUZXN0IGRvZXMgbm90IHN1cHBvcnQgZGVhdGggdGVzdHMg Zm9yIFZDIDcuMSBhbmQgZWFybGllciBhcwogLy8gYWJvcnQoKSBpbiBhIFZDIDcuMSBhcHBsaWNh dGlvbiBjb21waWxlZCBhcyBHVUkgaW4gZGVidWcgY29uZmlnCiAvLyBwb3BzIHVwIGEgZGlhbG9n IHdpbmRvdyB0aGF0IGNhbm5vdCBiZSBzdXBwcmVzc2VkIHByb2dyYW1tYXRpY2FsbHkuCi0jaWYg KEdURVNUX09TX0xJTlVYIHx8IEdURVNUX09TX01BQyB8fCBHVEVTVF9PU19DWUdXSU4gfHwgR1RF U1RfT1NfU09MQVJJUyB8fCBcCisjaWYgKEdURVNUX09TX0xJTlVYIHx8IEdURVNUX09TX0ZSRUVC U0QgfHwgR1RFU1RfT1NfSFVSRCB8fCBcCisgICAgIEdURVNUX09TX01BQyB8fCBHVEVTVF9PU19D WUdXSU4gfHwgR1RFU1RfT1NfU09MQVJJUyB8fCBcCiAgICAgIChHVEVTVF9PU19XSU5ET1dTX0RF U0tUT1AgJiYgX01TQ19WRVIgPj0gMTQwMCkgfHwgXAogICAgICBHVEVTVF9PU19XSU5ET1dTX01J TkdXIHx8IEdURVNUX09TX0FJWCkKICNkZWZpbmUgR1RFU1RfSEFTX0RFQVRIX1RFU1QgMQo=