From 41ba54aeec18e9a22b8c20801a04be380ff10023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= Date: Tue, 21 Jan 2014 12:30:46 +0700 Subject: [PATCH] Make tpl2tc.py actually generate the checked-in files The newline changes in .tpl files and tpl2tc.py may look unrelated, but without them there were (other, uglier) newline changes when regenerating. Note that preload-metadata-buffered-ogg.html has been manually modified and is excluded in common.py, so it has not been touched. --- html/semantics/embedded-content-0/media-elements/common.py | 7 ++++--- .../media-elements/preload-auto-event-order-dataurl.html | 2 +- .../media-elements/preload-auto-event-order.tpl | 2 +- .../preload-auto-to-none-event-order-dataurl.html | 2 +- .../media-elements/preload-auto-to-none-event-order.tpl | 2 +- .../media-elements/preload-metadata-buffered-dataurl.html | 2 +- .../media-elements/preload-metadata-buffered.tpl | 2 +- ...ad-metadata-event-order-play-after-suspend-dataurl.html | 2 +- .../preload-metadata-event-order-play-after-suspend.tpl | 2 +- ...reload-metadata-networkstate-after-suspend-dataurl.html | 2 +- .../preload-metadata-networkstate-after-suspend.tpl | 2 +- ...etadata-to-none-after-loadstart-readystate-dataurl.html | 2 +- ...d-metadata-to-none-after-source-readystate-dataurl.html | 2 +- ...ad-metadata-to-none-after-src-networkstate-dataurl.html | 1 - ...reload-metadata-to-none-after-src-networkstate-mp4.html | 1 - ...reload-metadata-to-none-after-src-networkstate-ogg.html | 1 - ...eload-metadata-to-none-after-src-networkstate-webm.html | 1 - .../preload-metadata-to-none-after-src-networkstate.tpl | 1 - ...load-metadata-to-none-after-src-readystate-dataurl.html | 2 +- ...-metadata-to-none-before-source-readystate-dataurl.html | 2 +- .../preload-metadata-to-none-before-source-readystate.tpl | 2 +- ...oad-metadata-to-none-before-src-readystate-dataurl.html | 2 +- .../preload-metadata-to-none-before-src-readystate.tpl | 2 +- .../preload-metadata-to-none-event-order-dataurl.html | 2 +- .../media-elements/preload-none-buffered-dataurl.html | 2 +- .../media-elements/preload-none-buffered.tpl | 2 +- ...ad-none-event-order-autoplay-after-suspend-dataurl.html | 2 +- .../preload-none-event-order-autoplay-after-suspend.tpl | 2 +- .../preload-none-event-order-autoplay-dataurl.html | 2 +- .../media-elements/preload-none-event-order-autoplay.tpl | 2 +- html/semantics/embedded-content-0/media-elements/tpl2tc.py | 4 +++- 31 files changed, 31 insertions(+), 33 deletions(-) diff --git a/html/semantics/embedded-content-0/media-elements/common.py b/html/semantics/embedded-content-0/media-elements/common.py index a8afd1dd53b85e..f90d65eb658e5d 100644 --- a/html/semantics/embedded-content-0/media-elements/common.py +++ b/html/semantics/embedded-content-0/media-elements/common.py @@ -1,9 +1,10 @@ #media sources dataurl_src = "'data:audio/wav;base64,UklGRigAAABXQVZFZm10IBAAAAABAAEARKwAAIhYAQACABAAZGF0YQQAAAAAAAAA'" -mp4_src = "/media/preload.mp4?pipe=trickle(100000:d1:r2)&nocache=' + Math.random()"; -ogg_src = "/media/preload.ogv?pipe=trickle(100000:d1:r2)&nocache=' + Math.random()"; -webm_src = "/media/preload.webm?pipe=trickle(100000:d1:r2)&nocache=' + Math.random()"; +throttler = "'/media/preload.%s?pipe=trickle(100000:d1:r2)&nocache=' + Math.random()"; +mp4_src = throttler % 'mp4' +ogg_src = throttler % 'ogv' +webm_src = throttler % 'webm' #preload="auto" event orders auto_event_order = '/^loadstart (progress )+loadedmetadata (progress )*loadeddata (progress )*canplay (progress )*canplaythrough $/g' diff --git a/html/semantics/embedded-content-0/media-elements/preload-auto-event-order-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-auto-event-order-dataurl.html index 55e76b22d91a2d..3f19f616f9ee30 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-auto-event-order-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-auto-event-order-dataurl.html @@ -44,4 +44,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-auto-event-order.tpl b/html/semantics/embedded-content-0/media-elements/preload-auto-event-order.tpl index 412c6da39a091d..7358452f0f35ed 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-auto-event-order.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-auto-event-order.tpl @@ -43,4 +43,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order-dataurl.html index caaf0ea421c10c..10e7b61d214aa3 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order-dataurl.html @@ -49,4 +49,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order.tpl b/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order.tpl index 97c7a504c89145..9f5d4e985c219b 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order.tpl @@ -48,4 +48,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered-dataurl.html index c81f4fdd09ae5b..1667a68771ade1 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered-dataurl.html @@ -45,4 +45,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered.tpl index 05abe5aad2da9f..1c42a3fcec0eb6 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-buffered.tpl @@ -44,4 +44,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend-dataurl.html index 8e5d358be0096f..322734fb524bf9 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend-dataurl.html @@ -49,4 +49,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend.tpl index cdd76a32007082..aa541e2317dfe3 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend.tpl @@ -48,4 +48,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend-dataurl.html index 2957bbdc71ee51..b8f3ccb2c032ad 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend-dataurl.html @@ -34,4 +34,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend.tpl index 38e216ba60cd48..011cb9f00bcdbd 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend.tpl @@ -33,4 +33,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-loadstart-readystate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-loadstart-readystate-dataurl.html index cf49ea6f4b730f..3ceabaa7cc0917 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-loadstart-readystate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-loadstart-readystate-dataurl.html @@ -35,4 +35,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-source-readystate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-source-readystate-dataurl.html index 6c8fbf8b5d01a0..8d0992d771e8a7 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-source-readystate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-source-readystate-dataurl.html @@ -37,4 +37,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-dataurl.html index bcb268afb93d63..abd0950dd94c6a 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-dataurl.html @@ -36,4 +36,3 @@ }); }); - diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-mp4.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-mp4.html index 5f398969a76428..d48d5cf6d55562 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-mp4.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-mp4.html @@ -36,4 +36,3 @@ }); }); - diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-ogg.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-ogg.html index 68ea3a8c2a551a..e0ca9787c12181 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-ogg.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-ogg.html @@ -36,4 +36,3 @@ }); }); - diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-webm.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-webm.html index e94618311460ed..84fa0e028ef694 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-webm.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-webm.html @@ -36,4 +36,3 @@ }); }); - diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate.tpl index 41ec5a031c9c26..42cc6f6e894397 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate.tpl @@ -1,2 +1 @@ $include preload-metadata-to-none-after-src-readystate.tpl - diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-readystate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-readystate-dataurl.html index 3f851a5909e0f4..b3842b2eb8d466 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-readystate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-readystate-dataurl.html @@ -35,4 +35,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate-dataurl.html index 85253e79b2a6b8..9a9551ed1ce684 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate-dataurl.html @@ -37,4 +37,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate.tpl index db840a74f0e2bb..befac251ad2ef3 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate.tpl @@ -36,4 +36,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate-dataurl.html index 57f12a364e6a48..d4a3dfe1faad92 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate-dataurl.html @@ -35,4 +35,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate.tpl b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate.tpl index deea6140b8e0a1..7e16d5b64c3222 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate.tpl @@ -34,4 +34,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-event-order-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-event-order-dataurl.html index 7d2bb464243be3..7d35cc8f15e1c2 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-event-order-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-event-order-dataurl.html @@ -49,4 +49,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-buffered-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-none-buffered-dataurl.html index fec4da3c7d8428..bdde39df60152d 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-buffered-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-none-buffered-dataurl.html @@ -42,4 +42,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-buffered.tpl b/html/semantics/embedded-content-0/media-elements/preload-none-buffered.tpl index 2da9b486283de5..1ec0e292783800 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-buffered.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-none-buffered.tpl @@ -41,4 +41,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend-dataurl.html index 45d3939d7d7d5f..61968dea54f635 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend-dataurl.html @@ -48,4 +48,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend.tpl b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend.tpl index c5a32529057c2e..9abf9c57ba936b 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend.tpl @@ -47,4 +47,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-dataurl.html b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-dataurl.html index 2c68211c7744c9..e18d1dabb001b0 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-dataurl.html +++ b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-dataurl.html @@ -45,4 +45,4 @@ } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay.tpl b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay.tpl index fc24544d148d55..66e37dcc21baed 100644 --- a/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay.tpl +++ b/html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay.tpl @@ -44,4 +44,4 @@ tests.forEach(function(vars) { } }); }); - \ No newline at end of file + diff --git a/html/semantics/embedded-content-0/media-elements/tpl2tc.py b/html/semantics/embedded-content-0/media-elements/tpl2tc.py index 00cecbedffae42..61809d3a4e9a25 100755 --- a/html/semantics/embedded-content-0/media-elements/tpl2tc.py +++ b/html/semantics/embedded-content-0/media-elements/tpl2tc.py @@ -57,7 +57,7 @@ def create_test(template_dir, template_filename): template_file = open(os.path.join(template_dir, template_filename), 'r') file_contents = template_file.read() template_file.close() - pattern = re.compile('^\$include (.+)$', re.M) + pattern = re.compile('^\$include (.+)\n', re.M) try: file_contents = re.sub(pattern, get_included_template(template_dir), file_contents) except IOError as e: @@ -105,6 +105,8 @@ def create_test(template_dir, template_filename): def get_testsuite(template_dir, template_filename): if os.path.join(template_dir, template_filename) in common.testsuite: testsuite = common.testsuite[os.path.join(template_dir, template_filename)] + elif template_dir == '.' and template_filename in common.testsuite: + testsuite = common.testsuite[template_filename] elif template_dir in common.testsuite: testsuite = common.testsuite[template_dir] else: