Bug 692625 - Move browser/devtools/styleinspector/test/browser/ to...

Bug 692625 - Move browser/devtools/styleinspector/test/browser/ to browser/devtools/styleinspector/test/; r=rcampbell

--HG--
rename : browser/devtools/styleinspector/test/browser/Makefile.in => browser/devtools/styleinspector/test/Makefile.in
rename : browser/devtools/styleinspector/test/browser/browser_bug683672.html => browser/devtools/styleinspector/test/browser_bug683672.html
rename : browser/devtools/styleinspector/test/browser/browser_bug683672.js => browser/devtools/styleinspector/test/browser_bug683672.js
rename : browser/devtools/styleinspector/test/browser/browser_bug_692400_element_style.js => browser/devtools/styleinspector/test/browser_bug_692400_element_style.js
rename : browser/devtools/styleinspector/test/browser/browser_csslogic_inherited.js => browser/devtools/styleinspector/test/browser_csslogic_inherited.js
rename : browser/devtools/styleinspector/test/browser/browser_ruleview_editor.js => browser/devtools/styleinspector/test/browser_ruleview_editor.js
rename : browser/devtools/styleinspector/test/browser/browser_ruleview_inherit.js => browser/devtools/styleinspector/test/browser_ruleview_inherit.js
rename : browser/devtools/styleinspector/test/browser/browser_ruleview_manipulation.js => browser/devtools/styleinspector/test/browser_ruleview_manipulation.js
rename : browser/devtools/styleinspector/test/browser/browser_ruleview_override.js => browser/devtools/styleinspector/test/browser_ruleview_override.js
rename : browser/devtools/styleinspector/test/browser/browser_ruleview_ui.js => browser/devtools/styleinspector/test/browser_ruleview_ui.js
rename : browser/devtools/styleinspector/test/browser/browser_styleinspector.js => browser/devtools/styleinspector/test/browser_styleinspector.js
rename : browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672744_search_filter.js => browser/devtools/styleinspector/test/browser_styleinspector_bug_672744_search_filter.js
rename : browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_672746_default_styles.js => browser/devtools/styleinspector/test/browser_styleinspector_bug_672746_default_styles.js
rename : browser/devtools/styleinspector/test/browser/browser_styleinspector_bug_689759_no_results_placeholder.js => browser/devtools/styleinspector/test/browser_styleinspector_bug_689759_no_results_placeholder.js
rename : browser/devtools/styleinspector/test/browser/head.js => browser/devtools/styleinspector/test/head.js

browser/devtools/styleinspector/Makefile.in

@@ -43,9 +43,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef ENABLE_TESTS
-DIRS += test/browser
-endif
+TEST_DIRS = test
 
 include $(topsrcdir)/config/rules.mk
 

browser/devtools/styleinspector/test/browser/Makefile.in → browser/devtools/styleinspector/test/Makefile.in

@@ -36,11 +36,11 @@
 #
 # ***** 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/devtools/styleinspector/test/browser/browser_bug683672.js → browser/devtools/styleinspector/test/browser_bug683672.js

@@ -7,7 +7,7 @@
 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");