95599 2012-08-31 12:38:40 -0700 [Chromium-Android] Remove test_expectations_android.txt 2012-09-01 12:00:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Android RESOLVED INVALID P2 Normal --- 93627 1 wangxianzhu wangxianzhu abarth dpranke ojan peter webkit.review.bot oldest_to_newest 709898 0 wangxianzhu 2012-08-31 12:38:40 -0700 LayoutTests/platform/chromium/test_expectations_android.txt is used to store Android-specific expectations. It's empty in upstream. As we have upstreamed most of the contents in downstream test_expectations_android.txt, it's time to remove it. 709903 1 wangxianzhu 2012-08-31 12:41:38 -0700 In downstream we'll keep test_expectations_android.txt for some time and use --additional-expectations to include the file. 709908 2 161754 wangxianzhu 2012-08-31 12:48:38 -0700 Created attachment 161754 Patch 709921 3 dpranke 2012-08-31 13:19:25 -0700 alternatively, you could leave it in, upstream it, and add it to the end of the expectations_files() list (so it was included in the cascade) and then move your skipped tests there from skipped_layout_tests(). 709922 4 dpranke 2012-08-31 13:21:22 -0700 (In reply to comment #3) > alternatively, you could leave it in, upstream it, and add it to the end of the expectations_files() list (so it was included in the cascade) and then move your skipped tests there from skipped_layout_tests(). Whoops, of course you already have it in expectations_files(). So, you could leave it there and moved the skipped tests there. I'd probably recommend that as, as much as we're not used to having an additional expectations file for android, we're used to having a list of tests embedded in the code even less. Or we could just add an ANDROID modifier to the TestExpectations syntax and move those lines into the main file. 709923 5 dpranke 2012-08-31 13:22:47 -0700 (I r+'ed the change so it's up to you ... whichever you want to do). 709953 6 wangxianzhu 2012-08-31 13:53:15 -0700 (In reply to comment #5) > (I r+'ed the change so it's up to you ... whichever you want to do). Thanks for review. Our goal is to upstream all contents in test_expectations_android.txt into TestExpectations, so I prefer to remove it from upstream. Will only submit after downstream change (using --additional-expectations in downstream buildbot script) is ready. The directories hard-coded in skipped_layout_tests() doesn't look good. I tried to put them in TestExpectations, but it's not easy to skip whole directories because in TestExpectations there are many existing rules of individual tests under the directories. Filed bug 95605. 710004 7 wangxianzhu 2012-08-31 14:43:13 -0700 Using the method in bug 95605, abandon this one because we want to keep test_expectations_android.txt to skip the whole directories. 710190 8 161754 abarth 2012-09-01 00:56:12 -0700 Comment on attachment 161754 Patch That's exciting! 710192 9 abarth 2012-09-01 00:58:10 -0700 (In reply to comment #8) > (From update of attachment 161754 [details]) > That's exciting! Oh, I guess this didn't land. 710274 10 wangxianzhu 2012-09-01 11:59:43 -0700 (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 161754 [details] [details]) > > That's exciting! > > Oh, I guess this didn't land. Yeah, it's also exciting to keep only a minimal platform/chromium-android/TestExpectations (bug 95605) :) 161754 2012-08-31 12:48:38 -0700 2012-09-01 12:00:36 -0700 Patch bug-95599-20120831124826.patch text/plain 3262 wangxianzhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MzAxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjhhNjg3ZTUwNWVmMmQzYjJkMzcwMzM2Zjc5YzRjZDI0 NWQ5MmU1NC4uMTRhOWU1NzU4YTk4NDFkNDRjZWNmMjdhYTJhNjQ3YmNhMTdhOTFjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA4LTMxICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFJlbW92ZSB0ZXN0X2V4cGVjdGF0aW9uc19h bmRyb2lkLnR4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTU1OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgZXh0cmEgbG9naWMgZm9yIHRlc3RfZXhwZWN0YXRpb25zX2FuZHJvaWQudHh0IGlzIG5v IGxvbmdlciB1c2VmdWwKKyAgICAgICAgYXMgd2UgaGF2ZSBhZGRlZCBBbmRyb2lkIGV4cGVjdGF0 aW9ucyBpbiBUZXN0RXhwZWN0YXRpb25zLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5OgorICAgICAgICAoQ2hyb21pdW1B bmRyb2lkUG9ydC5leHBlY3RhdGlvbnNfZmlsZXMpOiBSZW1vdmVkLgorCiAyMDEyLTA4LTMxICBK b24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBbVGVzdHNdIEFkZCBiYXNpYyB0 ZXN0cyB0byBodHRwL3Rlc3RzL25vdGlmaWNhdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQpp bmRleCBhOGI4ODJiNmNkMWE2MDQ1MmJhNWI3YTY4ZjFlODUyMDdhYWZkNDBiLi4zMzlhYzlmYjg3 YjRiYmRhZmVmZjZhNTMzNDhhMDBkNjdkODRlMTgxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5 CkBAIC0yMTAsMTEgKzIxMCw2IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0u Q2hyb21pdW1Qb3J0KToKICAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgcmV0 dXJuIFRydWUKIAotICAgICMgRklYTUU6IFJlbW92ZSB0aGlzIGZ1bmN0aW9uIHdoZW4gY2hyb21p dW0tYW5kcm9pZCBpcyBmdWxseSB1cHN0cmVhbS4KLSAgICBkZWYgZXhwZWN0YXRpb25zX2ZpbGVz KHNlbGYpOgotICAgICAgICBhbmRyb2lkX2V4cGVjdGF0aW9uc19maWxlID0gc2VsZi5wYXRoX2Zy b21fd2Via2l0X2Jhc2UoJ0xheW91dFRlc3RzJywgJ3BsYXRmb3JtJywgJ2Nocm9taXVtJywgJ3Rl c3RfZXhwZWN0YXRpb25zX2FuZHJvaWQudHh0JykKLSAgICAgICAgcmV0dXJuIHN1cGVyKENocm9t aXVtQW5kcm9pZFBvcnQsIHNlbGYpLmV4cGVjdGF0aW9uc19maWxlcygpICsgW2FuZHJvaWRfZXhw ZWN0YXRpb25zX2ZpbGVdCi0KICAgICBkZWYgc3RhcnRfaHR0cF9zZXJ2ZXIoc2VsZiwgYWRkaXRp b25hbF9kaXJzPU5vbmUsIG51bWJlcl9vZl9zZXJ2ZXJzPTApOgogICAgICAgICAjIFRoZSBodHRw IHNlcnZlciBydW5zIGR1cmluZyB0aGUgd2hvbGUgdGVzdGluZyBwZXJpb2QsIHNvIGlnbm9yZSB0 aGlzIGNhbGwuCiAgICAgICAgIHBhc3MKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxv ZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZmQ0YTUxM2FlYmU1NTY4MzVhMmJmODhm NjlhYWQ5ZjJhNGJhYjNhLi5iNTIyNTQ0ZDMxM2EwOTkwYzg5ZjgwZjhlNGQ5YTBhMjVhNGUxMGRm IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDgtMzEgIFhpYW56aHUgV2FuZyAgPHdhbmd4 aWFuemh1QGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW0tQW5kcm9pZF0gUmVtb3Zl IHRlc3RfZXhwZWN0YXRpb25zX2FuZHJvaWQudHh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU5OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlv bnNfYW5kcm9pZC50eHQ6IFJlbW92ZWQuCisKIDIwMTItMDgtMzEgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgKFJlZ3Jlc3Npb246IHIxMjY3NzQpOiBG aXggY3Jhc2ggd2hlbiBzY3JvbGxpbmcgYWZ0ZXIgcmVtb3ZpbmcgaW5saW5lIHN0aWNreSBlbGVt ZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVj dGF0aW9uc19hbmRyb2lkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3Rf ZXhwZWN0YXRpb25zX2FuZHJvaWQudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAy MTM3ZDc5OWJlOGExYzFlN2E4YThlZDcyYmExNjdmMTZmNzM1MjlmLi4wMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9t aXVtL3Rlc3RfZXhwZWN0YXRpb25zX2FuZHJvaWQudHh0CisrKyAvZGV2L251bGwKQEAgLTEsNiAr MCwwIEBACi0vLyBUaGlzIGZpbGUgc2hvdWxkIHJlbWFpbiBlbXB0eS4gSXQgaXMgdXNlZCBieSB0 aGUgY2hyb21pdW0tYW5kcm9pZCBwb3J0IGluCi0vLyBpdHMgZG93bnN0cmVhbSByZXBvc2l0b3J5 IHRvIG1hbmFnZSB0ZXN0IGV4cGVjYXRpb25zIGRvd25zdHJlYW0uICBXaGVuIHRoZQotLy8gY2hy b21pdW0tYW5kcm9pZCBwb3J0IHJ1bnMgdGVzdHMgb24gYnVpbGQud2Via2l0Lm9yZywgdGVzdCBl eHBlY3RhdGlvbnMKLS8vIHNob3VsZCBiZSBwdXQgaW4gdGhlIENocm9taXVtIFRlc3RFeHBlY3Rh dGlvbnMgZmlsZSBhcyBub3JtYWwgcmF0aGVyIHRoYW4KLS8vIGhlcmUuICBXZSB3aWxsIGRlbGV0 ZSB0aGlzIGZpbGUgb25jZSB3ZSBmaW5pc2ggdXBzdHJlYW1pbmcgdGhlCi0vLyBjaHJvbWl1bS1h bmRyb2lkIHBvcnQuCg==