make reference to newly named image file correct

2dcontext/conformance-requirements/2d.coordinatespace-manual.html

@@ -14,7 +14,7 @@ <h1>2d.coordinatespace</h1>
 <p class="notes">This should not be upside down.
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.coordinatespace.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.coordinatespace-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Coordinate space goes from top-left to bottom-right");

2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.basic-manual.html

@@ -14,7 +14,7 @@ <h1>2d.text.draw.fill.basic</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.basic.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.basic-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("fillText draws filled text");

2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.maxWidth.large-manual.html

@@ -14,7 +14,7 @@ <h1>2d.text.draw.fill.maxWidth.large</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.maxWidth.large.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.maxWidth.large-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("fillText handles maxWidth correctly");

2dcontext/drawing-text-to-the-canvas/2d.text.draw.fill.rtl-manual.html

@@ -14,7 +14,7 @@ <h1>2d.text.draw.fill.rtl</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.rtl.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.fill.rtl-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("fillText respects Right-To-Left Override characters");

2dcontext/drawing-text-to-the-canvas/2d.text.draw.stroke.basic-manual.html

@@ -14,7 +14,7 @@ <h1>2d.text.draw.stroke.basic</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.stroke.basic.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.text.draw.stroke.basic-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("strokeText draws stroked text");

2dcontext/shadows/2d.shadow.blur.high-manual.html

@@ -14,7 +14,7 @@ <h1>2d.shadow.blur.high</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.shadow.blur.high.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.shadow.blur.high-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Shadows look correct for large blurs");

2dcontext/shadows/2d.shadow.blur.low-manual.html

@@ -14,7 +14,7 @@ <h1>2d.shadow.blur.low</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.shadow.blur.low.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.shadow.blur.low-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("Shadows look correct for small blurs");

2dcontext/tools/gentest.py

@@ -408,7 +408,10 @@ def expand_mochitest_code(code):
                 expected)
             expected += "\nsurface.write_to_png('%s/%s.png')\n" % (IMAGEOUTPUTDIR, mapped_name)
             eval(compile(expected, '<test %s>' % test['name'], 'exec'), {}, {'cairo':cairo})
-            expected_img = "%s.png" % name
+            if '@manual' in test['code']:
+                expected_img = "%s-manual.png" % name
+            else:
+                expected_img = "%s.png" % name
 
         if expected_img:
             expectation_html = ('<p class="output expectedtext">Expected output:' +

html/semantics/embedded-content-0/the-canvas-element/2d.scaled-manual.html

@@ -14,7 +14,7 @@ <h1>2d.scaled</h1>
 
 <p class="output">Actual output:</p>
 <canvas id="c" class="output" width="50" height="25" style="width: 100px; height: 50px"><p class="fallback">FAIL (fallback content)</p></canvas>
-<p class="output expectedtext">Expected output:<p><img src="2d.scaled.png" class="output expected" id="expected" alt="">
+<p class="output expectedtext">Expected output:<p><img src="2d.scaled-manual.png" class="output expected" id="expected" alt="">
 <ul id="d"></ul>
 <script>
 var t = async_test("CSS-scaled canvases get drawn correctly");