Bug 663848 - move dom/tests/mochitest/general/*.xul to mochitest-chrome. r=enndeakin, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Sun, 19 Jun 2011 11:56:43 -0400
changeset 71569 195e125749f8cae61dcbb9bdd49b3bf0916905f4
parent 71568 6d2cd42969f9bebe2f62bf8e2ecc6420a4a5f504
child 71570 027aeee65fdb72416266d896c86e8273791a2e79
push id209
push userbzbarsky@mozilla.com
push dateTue, 05 Jul 2011 17:42:16 +0000
treeherdermozilla-aurora@cc6e30cce8af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenndeakin, test-only
bugs663848
milestone7.0a1
Bug 663848 - move dom/tests/mochitest/general/*.xul to mochitest-chrome. r=enndeakin, a=test-only
dom/tests/mochitest/general/Makefile.in
dom/tests/mochitest/general/test_innerScreen.xul
dom/tests/mochitest/general/test_offsets.xul
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -53,24 +53,31 @@ include $(topsrcdir)/config/rules.mk
 		test_bug628069_1.html \
 		test_bug628069_2.html \
 		file_bug628069.html \
 		test_bug631440.html \
 		test_bug653364.html \
 		test_consoleAPI.html \
 		test_domWindowUtils.html \
 		test_domWindowUtils_scrollXY.html \
-		test_innerScreen.xul \
 		test_offsets.html \
 		test_offsets.js \
-		test_offsets.xul \
 		test_windowProperties.html \
 		test_clipboard_events.html \
-		test_focusrings.xul \
 		test_nodesFromRect.html \
 		test_frameElementWrapping.html \
 		file_frameElementWrapping.html \
 		test_framedhistoryframes.html \
 		test_windowedhistoryframes.html \
+		test_focusrings.xul \
+		$(NULL)
+
+_CHROME_FILES = \
+		test_innerScreen.xul \
+		test_offsets.xul \
+		test_offsets.js \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
-	$(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
+
+libs:: $(_CHROME_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
--- a/dom/tests/mochitest/general/test_innerScreen.xul
+++ b/dom/tests/mochitest/general/test_innerScreen.xul
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
   Tests for mozInnerScreenX/Y properties
   -->
 <window title="Test mozInnerScreenX/Y Properties"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="text/javascript" src="/MochiKit/packed.js"/>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
   <!-- test resuls are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml"
         style="height: 400px; position:relative; overflow: auto;">
     <iframe id="f"
             style="position:absolute; left:100px;
                    top:200px; width:200px; height:200px; border:none;"></iframe>
   </body>
@@ -31,17 +31,16 @@ function doTests()
   try
   {
     mozScreenPixelsPerCSSPixel;
     readable = true;
   }
   catch(ex) { }
   ok(!readable, "window pixels per css pixel shouldn't be readable to content");
 
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
   var domWindowUtils = window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
                            .getInterface(Components.interfaces.nsIDOMWindowUtils);
   var devPxPerCSSPx = domWindowUtils.screenPixelsPerCSSPixel;
   var windowBO = document.documentElement.boxObject;
   isRounded(window.mozInnerScreenX*devPxPerCSSPx, windowBO.screenX,
             "window screen X");
   isRounded(window.mozInnerScreenY*devPxPerCSSPx, windowBO.screenY,
             "window screen Y");
--- a/dom/tests/mochitest/general/test_offsets.xul
+++ b/dom/tests/mochitest/general/test_offsets.xul
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
 <!--
   XUL Tests for client/scroll properties
   -->
 <window title="Test Offset/Client/Scroll Properties" width="500" height="600"
         style="margin: 1px !important"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="text/javascript" src="/MochiKit/packed.js"/>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"/>
+  <script type="text/javascript" src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
   <script type="text/javascript" src="test_offsets.js"/>
 
 <vbox id="testelements" style="margin: 0; padding: 0; border: 0;">
 <vbox id="vbox" style="margin: 5px 0 0 2px;">
   <vbox id="noscroll" align="start">
     <button id="button1" label="Button One" style="margin: 0px; padding: 0; border: 0;"/>
     <button id="button2" label="Button Two" width="140" height="120"/>
   </vbox>