Bug 692625 - Move browser/components/test/browser/ to browser/components/test/; r=gavin
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:21 +0000
changeset 82754 b3807e5362dae4f53117177ebf74dab31cd86bc8
parent 82753 379a992ed77ccf980d7580f56ae54e82af59364e
child 82755 524e771b72dbe67e6aa01fd8e913c0bb30132f88
push id4102
push userbmo@edmorley.co.uk
push dateFri, 16 Dec 2011 09:18:04 +0000
treeherdermozilla-inbound@718a7411a72b [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 browser/components/test/browser/ to browser/components/test/; r=gavin
browser/components/Makefile.in
browser/components/test/Makefile.in
browser/components/test/browser/Makefile.in
browser/components/test/browser/browser_bug538331.js
browser/components/test/browser_bug538331.js
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -73,19 +73,17 @@ PARALLEL_DIRS = \
   tabview \
   migration \
   $(NULL)
 
 ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
 endif
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS += test
 
 DIRS += build
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DOFFICIAL_BUILD=1
 endif
 
 include $(topsrcdir)/config/rules.mk
rename from browser/components/test/browser/Makefile.in
rename to browser/components/test/Makefile.in
--- a/browser/components/test/browser/Makefile.in
+++ b/browser/components/test/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  = browser/components/test/browser
+relativesrcdir  = browser/components/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
   browser_bug538331.js \
   $(NULL)
 
rename from browser/components/test/browser/browser_bug538331.js
rename to browser/components/test/browser_bug538331.js