Bug 692625 - Move toolkit/components/startup/tests/browser/ to toolkit/components/startup/tests/; r=dtownsend
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:23 +0000
changeset 82758 5ba5e09d2dbe150b494ca8409fe274cf74d02a31
parent 82757 c981969df93b208bada56dac1f4e7197e0cfb1de
child 82759 8f46911a6c6e44213e99e3bbe7f17dd6ed04eed1
push id21695
push userbmo@edmorley.co.uk
push dateFri, 16 Dec 2011 11:53:06 +0000
treeherdermozilla-central@dcf6e5163e63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdtownsend
bugs692625
milestone11.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 692625 - Move toolkit/components/startup/tests/browser/ to toolkit/components/startup/tests/; r=dtownsend
toolkit/components/startup/Makefile.in
toolkit/components/startup/tests/Makefile.in
toolkit/components/startup/tests/beforeunload.html
toolkit/components/startup/tests/browser/Makefile.in
toolkit/components/startup/tests/browser/beforeunload.html
toolkit/components/startup/tests/browser/browser_bug511456.js
toolkit/components/startup/tests/browser/browser_bug537449.js
toolkit/components/startup/tests/browser_bug511456.js
toolkit/components/startup/tests/browser_bug537449.js
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -65,15 +65,13 @@ else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 CMMSRCS += nsUserInfoMac.mm
 else
 CPPSRCS += nsUserInfoUnix.cpp
 endif
 endif
 endif
 
-ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
-DIRS += tests/browser
-endif
+TEST_DIRS = tests
 endif
 
 include $(topsrcdir)/config/rules.mk
rename from toolkit/components/startup/tests/browser/Makefile.in
rename to toolkit/components/startup/tests/Makefile.in
--- a/toolkit/components/startup/tests/browser/Makefile.in
+++ b/toolkit/components/startup/tests/Makefile.in
@@ -30,21 +30,21 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-relativesrcdir  = toolkit/components/startup/tests/browser
+relativesrcdir  = toolkit/components/startup/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
 	browser_bug511456.js \
 	browser_bug537449.js \
 	beforeunload.html \
rename from toolkit/components/startup/tests/browser/beforeunload.html
rename to toolkit/components/startup/tests/beforeunload.html
rename from toolkit/components/startup/tests/browser/browser_bug511456.js
rename to toolkit/components/startup/tests/browser_bug511456.js
--- a/toolkit/components/startup/tests/browser/browser_bug511456.js
+++ b/toolkit/components/startup/tests/browser_bug511456.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  * 
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,
   allowClose: false,
 
   // Window open handling
   windowLoad: function(win) {
     // Allow any other load handlers to execute
rename from toolkit/components/startup/tests/browser/browser_bug537449.js
rename to toolkit/components/startup/tests/browser_bug537449.js
--- a/toolkit/components/startup/tests/browser/browser_bug537449.js
+++ b/toolkit/components/startup/tests/browser_bug537449.js
@@ -31,17 +31,17 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  * 
  * ***** END LICENSE BLOCK ***** */
 
 const PROMPT_URL = "chrome://global/content/commonDialog.xul";
-const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
+const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
 
 var Watcher = {
   seen: false,
   allowClose: false,
 
   // Window open handling
   windowLoad: function(win) {
     // Allow any other load handlers to execute