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

@@ -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'

html/semantics/embedded-content-0/media-elements/preload-auto-event-order-dataurl.html

@@ -44,4 +44,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-auto-event-order.tpl

@@ -43,4 +43,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order-dataurl.html

@@ -49,4 +49,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-auto-to-none-event-order.tpl

@@ -48,4 +48,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-buffered-dataurl.html

@@ -45,4 +45,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-buffered.tpl

@@ -44,4 +44,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend-dataurl.html

@@ -49,4 +49,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-event-order-play-after-suspend.tpl

@@ -48,4 +48,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend-dataurl.html

@@ -34,4 +34,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-networkstate-after-suspend.tpl

@@ -33,4 +33,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-loadstart-readystate-dataurl.html

@@ -35,4 +35,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-source-readystate-dataurl.html

@@ -37,4 +37,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-dataurl.html

@@ -36,4 +36,3 @@
     });
 });
 </script>
-

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-mp4.html

@@ -36,4 +36,3 @@
     });
 });
 </script>
-

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-ogg.html

@@ -36,4 +36,3 @@
     });
 });
 </script>
-

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-networkstate-webm.html

@@ -36,4 +36,3 @@
     });
 });
 </script>
-

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
-

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-after-src-readystate-dataurl.html

@@ -35,4 +35,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate-dataurl.html

@@ -37,4 +37,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-source-readystate.tpl

@@ -36,4 +36,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate-dataurl.html

@@ -35,4 +35,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-before-src-readystate.tpl

@@ -34,4 +34,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-metadata-to-none-event-order-dataurl.html

@@ -49,4 +49,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-buffered-dataurl.html

@@ -42,4 +42,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-buffered.tpl

@@ -41,4 +41,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend-dataurl.html

@@ -48,4 +48,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-after-suspend.tpl

@@ -47,4 +47,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay-dataurl.html

@@ -45,4 +45,4 @@
 	}
     });
 });
-</script>
+</script>

html/semantics/embedded-content-0/media-elements/preload-none-event-order-autoplay.tpl

@@ -44,4 +44,4 @@ tests.forEach(function(vars) {
 	}
     });
 });
-</script>
+</script>

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: