From eb6ff80901499bee68f2cc77cb2e3c7db200c3fb Mon Sep 17 00:00:00 2001
From: "enndeakin%sympatico.ca"
 <enndeakin%sympatico.ca@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 21 Jul 2007 20:00:04 +0000
Subject: [PATCH] Bug 389082, adjust progressmeter test so that it actually
 runs, r=mano

git-svn-id: svn://10.0.0.236/trunk@230574 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/tests/chrome/Makefile.in          | 1 -
 mozilla/toolkit/content/tests/widgets/Makefile.in         | 1 +
 .../test_progressmeter.xul}                               | 8 +++-----
 3 files changed, 4 insertions(+), 6 deletions(-)
 rename mozilla/toolkit/content/tests/{chrome/widget_progressmeter.xul => widgets/test_progressmeter.xul} (86%)

diff --git a/mozilla/toolkit/content/tests/chrome/Makefile.in b/mozilla/toolkit/content/tests/chrome/Makefile.in
index 6fafa133cfe..4f7eb7297ca 100644
--- a/mozilla/toolkit/content/tests/chrome/Makefile.in
+++ b/mozilla/toolkit/content/tests/chrome/Makefile.in
@@ -54,7 +54,6 @@ _TEST_FILES = 	bug288254_window.xul \
 		test_bug366992.xul \
 		bug331215_window.xul \
 		test_bug331215.xul \
-        widget_progressmeter.xul \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/mozilla/toolkit/content/tests/widgets/Makefile.in b/mozilla/toolkit/content/tests/widgets/Makefile.in
index 935552ed0b1..f367baff08b 100644
--- a/mozilla/toolkit/content/tests/widgets/Makefile.in
+++ b/mozilla/toolkit/content/tests/widgets/Makefile.in
@@ -50,6 +50,7 @@ _TEST_FILES = 	test_bug360220.xul \
 		test_colorpicker_popup.xul \
 		test_popup_coords.xul \
 		test_popup_recreate.xul \
+		test_progressmeter.xul \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/mozilla/toolkit/content/tests/chrome/widget_progressmeter.xul b/mozilla/toolkit/content/tests/widgets/test_progressmeter.xul
similarity index 86%
rename from mozilla/toolkit/content/tests/chrome/widget_progressmeter.xul
rename to mozilla/toolkit/content/tests/widgets/test_progressmeter.xul
index 57fa1216f31..ce76eba12b6 100644
--- a/mozilla/toolkit/content/tests/chrome/widget_progressmeter.xul
+++ b/mozilla/toolkit/content/tests/widgets/test_progressmeter.xul
@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<?xml-stylesheet href="/tests/SimpleTest/test.css" type="text/css"?>
 <!--
   XUL Widget Test for progressmeter
   -->
 <window title="Progressmeter" width="500" height="600"
         onload="doTests()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <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>      
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
 
   <progressmeter id="n1"/>
   <progressmeter id="n2" mode="undetermined"/>