Bug 663853 - move layout/xul/test/*.xul to mochitest-chrome. r=mats, a=test-only
authorJoel Maher <jmaher@mozilla.com>
Sun, 19 Jun 2011 11:56:44 -0400
changeset 71570 027aeee65fdb72416266d896c86e8273791a2e79
parent 71569 195e125749f8cae61dcbb9bdd49b3bf0916905f4
child 71571 d8b8e75bc4ab7a5bb88a226e530d16df5fb03dc7
push idunknown
push userunknown
push dateunknown
reviewersmats, test-only
bugs663853
milestone7.0a1
Bug 663853 - move layout/xul/test/*.xul to mochitest-chrome. r=mats, a=test-only
layout/xul/test/Makefile.in
layout/xul/test/test_bug372685.xul
layout/xul/test/test_bug398982-1.xul
layout/xul/test/test_bug398982-2.xul
--- a/layout/xul/test/Makefile.in
+++ b/layout/xul/test/Makefile.in
@@ -40,18 +40,24 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = layout/xul/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _TEST_FILES =\
-		test_bug372685.xul \
 		test_bug386386.html \
 		test_bug394800.xhtml \
-		test_bug398982-1.xul \
-		test_bug398982-2.xul \
 		test_bug563416.html \
 		$(NULL)
 
+_CHROME_FILES = \
+		test_bug372685.xul \
+		test_bug398982-1.xul \
+		test_bug398982-2.xul \
+		$(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/layout/xul/test/test_bug372685.xul
+++ b/layout/xul/test/test_bug372685.xul
@@ -1,20 +1,20 @@
 <?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"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="Test for Bug 372685">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=372685
 -->
 
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
 <menuitem id="a" style="display: -moz-stack;">
 <box id="b" style="display: -moz-popup; ">
 <box id="c" style="position: fixed;"></box>
 </box>
 </menuitem>
 
 <script class="testbody" type="application/javascript">
--- a/layout/xul/test/test_bug398982-1.xul
+++ b/layout/xul/test/test_bug398982-1.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"?>
 <menuitem xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:html="http://www.w3.org/1999/xhtml"
           style="position: absolute; ">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=398982
 -->
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
 <tooltip type="zzz">
 <treecols/>
 </tooltip>
 
 <script xmlns="http://www.w3.org/1999/xhtml" class="testbody" type="application/javascript">
 <![CDATA[
 function doe() {
--- a/layout/xul/test/test_bug398982-2.xul
+++ b/layout/xul/test/test_bug398982-2.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"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="Test for Bug 398982">
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=398982
 -->
-  <script type="application/javascript" src="/MochiKit/packed.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 
 <popupgroup style="position: absolute; ">
 <tooltip type="zzz">
 <treecols/>
 </tooltip>
 
 <script xmlns="http://www.w3.org/1999/xhtml" class="testbody" type="application/javascript">
 <![CDATA[