Bug 692625 - Move browser/devtools/styleinspector/test/browser/ to browser/devtools/styleinspector/test/; r=rcampbell
authorEd Morley <bmo@edmorley.co.uk>
Fri, 16 Dec 2011 09:11:21 +0000
changeset 82753 379a992ed77ccf980d7580f56ae54e82af59364e
parent 82752 4e4c03e4c37bf184990224d4ff9bfb2accada1ef
child 82754 b3807e5362dae4f53117177ebf74dab31cd86bc8
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)
reviewersrcampbell
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/devtools/styleinspector/test/browser/ to browser/devtools/styleinspector/test/; r=rcampbell
browser/devtools/styleinspector/Makefile.in
browser/devtools/styleinspector/test/Makefile.in
browser/devtools/styleinspector/test/browser/Makefile.in
browser/devtools/styleinspector/test/browser/browser_bug683672.html
browser/devtools/styleinspector/test/browser/browser_bug683672.js
browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js
browser/devtools/styleinspector/test/browser/browser_csslogic_inherited.js
browser/devtools/styleinspector/test/browser/browser_ruleview_editor.js
browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js
browser/devtools/styleinspector/test/browser/browser_ruleview_manipulation.js
browser/devtools/styleinspector/test/browser/browser_ruleview_override.js
browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js
browser/devtools/styleinspector/test/browser/browser_styleinspector.js
browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js
browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js
browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js
browser/devtools/styleinspector/test/browser/head.js
browser/devtools/styleinspector/test/browser_bug683672.html
browser/devtools/styleinspector/test/browser_bug683672.js
browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
browser/devtools/styleinspector/test/browser_csslogic_inherited.js
browser/devtools/styleinspector/test/browser_ruleview_editor.js
browser/devtools/styleinspector/test/browser_ruleview_inherit.js
browser/devtools/styleinspector/test/browser_ruleview_manipulation.js
browser/devtools/styleinspector/test/browser_ruleview_override.js
browser/devtools/styleinspector/test/browser_ruleview_ui.js
browser/devtools/styleinspector/test/browser_styleinspector.js
browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
browser/devtools/styleinspector/test/head.js
--- a/browser/devtools/styleinspector/Makefile.in
+++ b/browser/devtools/styleinspector/Makefile.in
@@ -38,16 +38,14 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS = test
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
rename from browser/devtools/styleinspector/test/browser/Makefile.in
rename to browser/devtools/styleinspector/test/Makefile.in
--- a/browser/devtools/styleinspector/test/browser/Makefile.in
+++ b/browser/devtools/styleinspector/test/Makefile.in
@@ -31,21 +31,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/devtools/styleinspector/test/browser
+relativesrcdir  = browser/devtools/styleinspector/test
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
   browser_styleinspector.js \
   browser_bug683672.js \
   browser_styleinspector_bug_672746_default_styles.js \
rename from browser/devtools/styleinspector/test/browser/browser_bug683672.html
rename to browser/devtools/styleinspector/test/browser_bug683672.html
rename from browser/devtools/styleinspector/test/browser/browser_bug683672.js
rename to browser/devtools/styleinspector/test/browser_bug683672.js
--- a/browser/devtools/styleinspector/test/browser/browser_bug683672.js
+++ b/browser/devtools/styleinspector/test/browser_bug683672.js
@@ -2,17 +2,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests that the style inspector works properly
 
 let doc;
 let stylePanel;
 
-const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/test/browser/browser_bug683672.html";
+const TEST_URI = "http://example.com/browser/browser/devtools/styleinspector/test/browser_bug683672.html";
 
 Cu.import("resource:///modules/devtools/CssHtmlTree.jsm");
 
 function test()
 {
   waitForExplicitFinish();
   ignoreAllUncaughtExceptions();
   addTab(TEST_URI);
rename from browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js
rename to browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
rename from browser/devtools/styleinspector/test/browser/browser_csslogic_inherited.js
rename to browser/devtools/styleinspector/test/browser_csslogic_inherited.js
rename from browser/devtools/styleinspector/test/browser/browser_ruleview_editor.js
rename to browser/devtools/styleinspector/test/browser_ruleview_editor.js
rename from browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js
rename to browser/devtools/styleinspector/test/browser_ruleview_inherit.js
rename from browser/devtools/styleinspector/test/browser/browser_ruleview_manipulation.js
rename to browser/devtools/styleinspector/test/browser_ruleview_manipulation.js
rename from browser/devtools/styleinspector/test/browser/browser_ruleview_override.js
rename to browser/devtools/styleinspector/test/browser_ruleview_override.js
rename from browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js
rename to browser/devtools/styleinspector/test/browser_ruleview_ui.js
rename from browser/devtools/styleinspector/test/browser/browser_styleinspector.js
rename to browser/devtools/styleinspector/test/browser_styleinspector.js
rename from browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js
rename to browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
rename from browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js
rename to browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
rename from browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js
rename to browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
rename from browser/devtools/styleinspector/test/browser/head.js
rename to browser/devtools/styleinspector/test/head.js