Bug 294260 - Backout toolkit/components/startup/tests portion of bug 692625 to relocate tests/browser

--HG--
rename : toolkit/components/startup/tests/Makefile.in => toolkit/components/startup/tests/browser/Makefile.in
rename : toolkit/components/startup/tests/beforeunload.html => toolkit/components/startup/tests/browser/beforeunload.html
extra : rebase_source : b42154117d2793da6e91ed1e4c3ce14f3f04fc3f
This commit is contained in:
Matthew Noorenberghe 2012-01-18 11:24:06 -08:00
parent 7cfdd2883f
commit 12bafb4cf7
5 changed files with 7 additions and 5 deletions

View File

@ -70,8 +70,10 @@ endif
endif
endif
ifdef ENABLE_TESTS
ifneq (mobile,$(MOZ_BUILD_APP))
TEST_DIRS = tests
DIRS += tests/browser
endif
endif
include $(topsrcdir)/config/rules.mk

View File

@ -35,11 +35,11 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = toolkit/components/startup/tests
relativesrcdir = toolkit/components/startup/tests/browser
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk

View File

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */
const PROMPT_URL = "chrome://global/content/commonDialog.xul";
const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
var Watcher = {
seen: false,

View File

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */
const PROMPT_URL = "chrome://global/content/commonDialog.xul";
const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/beforeunload.html";
const TEST_URL = "http://example.com/browser/toolkit/components/startup/tests/browser/beforeunload.html";
var Watcher = {
seen: false,