1337909 - Re-disable QR xpcshell tests on trees other than graphics

Status: RESOLVED FIXED

(Core :: Graphics: WebRender, defect)

Description

[Kartikaya Gupta (email:[e-mail])]

In bug 1335748 I enabled some QR tests on the graphics branch. It looks like part of that change was clobbered in a merge, when my changed collided with bug 1336813.

At [1] we can see the file history. At [2] we can see that my commit 12c02bf624c4 added a clause to the run-on-projects for xpcshell. And in the next commit [3] we can see the entire run-on-projects hunk is removed. Except it doesn't have the clause I added, because it landed on autoland which didn't have my commit. In the subsequent merge (commit 4f8b2d44eaa0) the diff shows the entire run-on-projects hunk, including my clause, getting removed [4].

This isn't the end of the world, but it means we're doing unnecessary builds and tests on mozilla-inbound, autoland, etc.

[1] https://hg.mozilla.org/mozilla-central/log/tip/taskcluster/ci/test/tests.yml
[2] https://hg.mozilla.org/mozilla-central/rev/12c02bf624c4#l3.174
[3] https://hg.mozilla.org/mozilla-central/rev/ed583f4e5054#l1.51
[4] https://hg.mozilla.org/mozilla-central/rev/4f8b2d44eaa0#l63.104

Comment 1

[Kartikaya Gupta (email:[e-mail])]

Attachment: Bug 1337909 - Fix merge error.

Review commit: https://reviewboard.mozilla.org/r/110742/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/110742/

Comment 2

[Joel Maher ( :jmaher ) (UTC -8)]

Comment on attachment 8835053 [details]
Bug 1337909 - Fix merge error.

https://reviewboard.mozilla.org/r/110742/#review112920

thanks :kats

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/d0c41f50cedf
Fix merge error. r=jmaher

Comment 4

[Kartikaya Gupta (email:[e-mail])]

Comment on attachment 8835053 [details]
Bug 1337909 - Fix merge error.

I asked jmaher (thanks!) to steal the review since I didn't want to let this sit for too long.

Comment 5

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/d0c41f50cedf

Comment 6

[Dustin J. Mitchell [:dustin] (he/him)]

Comment on attachment 8835053 [details]
Bug 1337909 - Fix merge error.

https://reviewboard.mozilla.org/r/110742/#review113368