The WPT conditions for things like expected-fail include all of the properties (e.g. e10s, bits) for each entry. For example: if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS In this case these two lines can be squashed because one has `debug` and the other has `not debug` but they are otherwise identical. Also these lines both have `not webrender` which is redundant because we aren't running WPT on mac with webrender at all. Version is redundant because there's only one version of mac being tested, and same for processor/bits. So really these two lines should be squashed to this: if (os == "mac"): PASS All of this extra goop makes it hard for humans to quickly understand what the state of the test is, and makes it hard to review changes. I filed bug 1469893 for handling this in the updater, but based on Joel's review comments on bug 1425592 and my own experience it's worth trying to do a one-time cleanup of this, because the manifest auto-updater shouldn't mess with existing entries as long as they don't contradict the new test results. So even though new tests/failure entries it adds will bring back the goop, at least we'll be in a somewhat better state.

Pushed by kgupta@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/463619034aae Manually remove remaining windows version 10.0.15063 clauses. r=jmaher https://hg.mozilla.org/integration/autoland/rev/5c54fdabc4f5 Squash a lot of redundant WPT clauses. r=jmaher