Bug 1026785 - gen_template.pl should generate html files by default for chrome mochitests, r=bholley
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 05 Aug 2014 13:56:43 -0400
changeset 198188 3d6182f6edfbbcac8bfcfdd2bf2c69c80be98c66
parent 198187 69551e5b1a5df921e55d1347de5b688125757918
child 198189 d99f8aaeb32b93aff5a4b0c447a0ccb5aea9b334
push id27264
push usernigelbabu@gmail.com
push dateThu, 07 Aug 2014 03:31:37 +0000
treeherdermozilla-central@afcb3af79d09 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1026785
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1026785 - gen_template.pl should generate html files by default for chrome mochitests, r=bholley
testing/mochitest/gen_template.pl
testing/mochitest/static/chrome.template.txt
testing/mochitest/static/chromexul.template.txt
--- a/testing/mochitest/gen_template.pl
+++ b/testing/mochitest/gen_template.pl
@@ -1,31 +1,33 @@
 #!/usr/bin/perl
 #
 #  gen_template.pl
 #  Makes test case templates.
 #  Takes two arguments:
 #
 #  -b : a bugnumber
-#  -type : template type. {html|xhtml|xul|th}. defaults to html.
+#  -type : template type. {html|xhtml|xul|th|chrome|chromexul}. defaults to html.
 #
 #  perl gen_template.pl -b 345876 -type xul
 #
 #  sends a test case template for bug 345876 to stdout
 use FindBin;
 use Getopt::Long;
 GetOptions("b=i"=> \$bug_number,
            "type:s"=> \$template_type);
 
 if ($template_type eq "xul") {
   $template_type = "$FindBin::RealBin/static/xul.template.txt";
 } elsif ($template_type eq "xhtml") {
   $template_type = "$FindBin::RealBin/static/xhtml.template.txt";
 } elsif ($template_type eq "chrome") {
   $template_type = "$FindBin::RealBin/static/chrome.template.txt";
+} elsif ($template_type eq "chromexul") {
+  $template_type = "$FindBin::RealBin/static/chromexul.template.txt";
 } elsif ($template_type eq "th") {
   $template_type = "$FindBin::RealBin/static/th.template.txt";
 } else {
   $template_type = "$FindBin::RealBin/static/test.template.txt";
 }
 
 open(IN,$template_type) or die("Failed to open myfile for reading.");
 while((defined(IN)) && ($line = <IN>)) {
--- a/testing/mochitest/static/chrome.template.txt
+++ b/testing/mochitest/static/chrome.template.txt
@@ -1,26 +1,31 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
-<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<!DOCTYPE HTML>
+<html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id={BUGNUMBER}
 -->
-<window title="Mozilla Bug {BUGNUMBER}"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug {BUGNUMBER}</title>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="chrome://global/skin"/>
+  <link rel="stylesheet" type="text/css" href="chrome://mochitkit/content/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
 
-  <!-- test results are displayed in the html:body -->
-  <body xmlns="http://www.w3.org/1999/xhtml">
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id={BUGNUMBER}"
-     target="_blank">Mozilla Bug {BUGNUMBER}</a>
-  </body>
-
-  <!-- test code goes here -->
-  <script type="application/javascript">
-  <![CDATA[
   /** Test for Bug {BUGNUMBER} **/
 
 
 
-  ]]>
+
+
   </script>
-</window>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id={BUGNUMBER}">Mozilla Bug {BUGNUMBER}</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
copy from testing/mochitest/static/chrome.template.txt
copy to testing/mochitest/static/chromexul.template.txt