Mochitests subsuites can currently only be a single manifest, so let's add a manifest that can be used for this.

If we add this combined manifest, I don't think we want to chain in the mochitest directories above.

https://hg.mozilla.org/integration/mozilla-inbound/rev/65cda04dc8d2

Backed out for breaking the build on all platforms. https://hg.mozilla.org/integration/mozilla-inbound/rev/2cc6e2c6ea12 https://tbpl.mozilla.org/php/getParsedLog.php?id=47726066&tree=Mozilla-Inbound

jgilbert: Are there plans to land a modified manifest and address this issue?

(In reply to Kim Moir [:kmoir] from comment #5) > jgilbert: Are there plans to land a modified manifest and address this issue? Yes, but I have not had much time in the last two weeks.

Okay thanks jgilbert for the status update.

Alright, so I had to do this the hard way. Bug 1068086 blocks us from using [include:] to pull in a manifest from a different directory, if that mochitest has support-files. Since support-files in includes don't work from different directories, I needed to pull the mochitest manifests that we wanted to include into the same dir as the including manifest. I also added an Exception for when 'fail-if' or other invalid keys are in the errata file. This should prevent us from accidentally trying this broken thing. I added a header to the generated manifest stating that it's generated, and noting how to generate it, and where to mark things as either skipped or expected-fail.

Comment on attachment 8492462 [details] [diff] [review] mochigl Review of attachment 8492462 [details] [diff] [review]: ----------------------------------------------------------------- Does this need to be reviewed by mochitest people? ::: dom/canvas/test/webgl-conformance/generate-wrappers-and-manifest.py @@ +34,5 @@ > +# This is a GENERATED FILE. Do not edit it directly. > +# Regenerated it by using `python generate-wrapper-and-manifest.py`. > +# Mark skipped tests in mochitest-errata.ini. > +# Mark failing tests in mochi-single.html. > +'''.strip() ++!

https://hg.mozilla.org/integration/mozilla-inbound/rev/499a2a39ac53