Bug 1949782 [wpt PR 50864] - Consolidate reference_file and is_test_reference into a single param, a=testonly

Automatic update from web-platform-tests
Consolidate reference_file and is_test_reference into a single param

The Canvas WPT test generator was using two variables to control how a
test file links to it's reference file: 'reference_file' and
'is_test_reference'. In the context of documenting all parameters,
having to explain why we have two different parameters to do this one
thing is awkward. The logic and documentation will be simpler by using a
single 'reference_file_link' parameter.

Bug: 393561071
Change-Id: Id4523455f72ceb94684799cd672d11d87c106653
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6219871
Reviewed-by: Andres Ricardo Perez <andresrperezchromium.org>
Commit-Queue: Jean-Philippe Gravel <jpgravelchromium.org>
Cr-Commit-Position: refs/heads/main{#1423298}

--

wpt-commits: 463424c2cb676beafcdfeb2a4848b54e9f66dc6a
wpt-pr: 50864

UltraBlame original commit: 6f5dfaea7dde13f02bac8198a7c253beaadb1a17

Author: marco-c

testing/web-platform/tests/html/canvas/tools/gentest.py

@@ -7660,10 +7660,57 @@
 )
 :
 
+#
+Generate
+reference
+file
+.
+            
+if
+canvas_type
+!
+=
+_CanvasType
+.
+WORKER
+or
+needs_worker_reference
+:
+                
+_render
+(
+jinja_env
+ref_templates
+[
+self
+.
+template_type
+]
+params
+                        
+ref_output_paths
+[
+canvas_type
+]
+)
+            
+#
+Generate
+test
+file
+with
+a
+link
+to
+the
+reference
+file
+.
+            
 params
 [
 '
-reference_file
+reference_file_link
 '
 ]
 =
@@ -7694,43 +7741,6 @@
 canvas_type
 ]
 )
-            
-if
-canvas_type
-!
-=
-_CanvasType
-.
-WORKER
-or
-needs_worker_reference
-:
-                
-params
-[
-'
-is_test_reference
-'
-]
-=
-True
-                
-_render
-(
-jinja_env
-ref_templates
-[
-self
-.
-template_type
-]
-params
-                        
-ref_output_paths
-[
-canvas_type
-]
-)
 
 def
 _write_testharness_test

testing/web-platform/tests/html/canvas/tools/templates/reftest_element.html

@@ -70,8 +70,7 @@
 {
 %
 if
-not
-is_test_reference
+reference_file_link
 %
 }
 <
@@ -86,7 +85,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "
@@ -351,7 +350,8 @@
 2
 )
 if
-is_test_reference
+not
+reference_file_link
 else
 code
 |

testing/web-platform/tests/html/canvas/tools/templates/reftest_element_grid.html

@@ -113,8 +113,7 @@
 {
 %
 if
-not
-is_test_reference
+reference_file_link
 %
 }
 <
@@ -129,7 +128,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "
@@ -570,7 +569,8 @@
 4
 )
 if
-is_test_reference
+not
+reference_file_link
 else
 variant
 .

testing/web-platform/tests/html/canvas/tools/templates/reftest_offscreen.html

@@ -79,7 +79,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "

testing/web-platform/tests/html/canvas/tools/templates/reftest_offscreen_grid.html

@@ -122,7 +122,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "

testing/web-platform/tests/html/canvas/tools/templates/reftest_worker.html

@@ -63,7 +63,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "

testing/web-platform/tests/html/canvas/tools/templates/reftest_worker_grid.html

@@ -89,7 +89,7 @@
 "
 {
 {
-reference_file
+reference_file_link
 }
 }
 "