Bug 692625 - Move toolkit/components/aboutmemory/tests/chrome/ to toolkit/components/aboutmemory/tests/; r=gavin f=njn
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:23 +0000
changeset 82757 c981969df93b208bada56dac1f4e7197e0cfb1de
parent 82756 524e771b72dbe67e6aa01fd8e913c0bb30132f88
child 82758 5ba5e09d2dbe150b494ca8409fe274cf74d02a31
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)
reviewersgavin
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/aboutmemory/tests/chrome/ to toolkit/components/aboutmemory/tests/; r=gavin f=njn
toolkit/components/aboutmemory/Makefile.in
toolkit/components/aboutmemory/tests/Makefile.in
toolkit/components/aboutmemory/tests/chrome/Makefile.in
toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul
toolkit/components/aboutmemory/tests/chrome/test_asyncClose_leak.xul
toolkit/components/aboutmemory/tests/test_aboutmemory.xul
toolkit/components/aboutmemory/tests/test_asyncClose_leak.xul
--- a/toolkit/components/aboutmemory/Makefile.in
+++ b/toolkit/components/aboutmemory/Makefile.in
@@ -38,13 +38,11 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-DIRS += tests/chrome
-endif
+TEST_DIRS = tests
 
 include $(topsrcdir)/config/rules.mk
rename from toolkit/components/aboutmemory/tests/chrome/Makefile.in
rename to toolkit/components/aboutmemory/tests/Makefile.in
--- a/toolkit/components/aboutmemory/tests/chrome/Makefile.in
+++ b/toolkit/components/aboutmemory/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/aboutmemory/tests/chrome
+relativesrcdir  = toolkit/components/aboutmemory/tests
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _CHROME_FILES	= \
 		test_aboutmemory.xul \
 		test_asyncClose_leak.xul \
 		$(NULL)
rename from toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul
rename to toolkit/components/aboutmemory/tests/test_aboutmemory.xul
rename from toolkit/components/aboutmemory/tests/chrome/test_asyncClose_leak.xul
rename to toolkit/components/aboutmemory/tests/test_asyncClose_leak.xul