diff --git a/Makefile.in b/Makefile.in index e87d4b477a2..5f823293f57 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,7 +93,6 @@ default alldep all:: $(topsrcdir)/configure config.status $(RM) -r $(DIST)/public $(RM) -r $(DIST)/bin/components $(RM) -r _tests - $(RM) -r $(mochitestdir) $(topsrcdir)/configure: $(topsrcdir)/configure.in @echo "STOP! configure.in has changed, and your configure is out of date." diff --git a/accessible/tests/mochitest/Makefile.in b/accessible/tests/mochitest/Makefile.in index d7445af5b49..b019906c397 100644 --- a/accessible/tests/mochitest/Makefile.in +++ b/accessible/tests/mochitest/Makefile.in @@ -113,4 +113,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/actions/Makefile.in b/accessible/tests/mochitest/actions/Makefile.in index fdcfcbddbb7..51537d36e49 100644 --- a/accessible/tests/mochitest/actions/Makefile.in +++ b/accessible/tests/mochitest/actions/Makefile.in @@ -61,4 +61,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/attributes/Makefile.in b/accessible/tests/mochitest/attributes/Makefile.in index 29972a22157..786438b640c 100644 --- a/accessible/tests/mochitest/attributes/Makefile.in +++ b/accessible/tests/mochitest/attributes/Makefile.in @@ -55,4 +55,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/editabletext/Makefile.in b/accessible/tests/mochitest/editabletext/Makefile.in index 21999d81f65..1870bfe80a2 100644 --- a/accessible/tests/mochitest/editabletext/Makefile.in +++ b/accessible/tests/mochitest/editabletext/Makefile.in @@ -52,4 +52,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/events/Makefile.in b/accessible/tests/mochitest/events/Makefile.in index 34c6d0bf888..56041ec8655 100644 --- a/accessible/tests/mochitest/events/Makefile.in +++ b/accessible/tests/mochitest/events/Makefile.in @@ -94,4 +94,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/focus/Makefile.in b/accessible/tests/mochitest/focus/Makefile.in index 933abe11022..61b766d1d2d 100644 --- a/accessible/tests/mochitest/focus/Makefile.in +++ b/accessible/tests/mochitest/focus/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/hyperlink/Makefile.in b/accessible/tests/mochitest/hyperlink/Makefile.in index d561a29fb3f..e59dcaf72b7 100644 --- a/accessible/tests/mochitest/hyperlink/Makefile.in +++ b/accessible/tests/mochitest/hyperlink/Makefile.in @@ -52,4 +52,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/hypertext/Makefile.in b/accessible/tests/mochitest/hypertext/Makefile.in index c96d6917b99..be05ccff42f 100644 --- a/accessible/tests/mochitest/hypertext/Makefile.in +++ b/accessible/tests/mochitest/hypertext/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/name/Makefile.in b/accessible/tests/mochitest/name/Makefile.in index 73adfc3af6d..41a0ca99bcb 100644 --- a/accessible/tests/mochitest/name/Makefile.in +++ b/accessible/tests/mochitest/name/Makefile.in @@ -62,4 +62,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/relations/Makefile.in b/accessible/tests/mochitest/relations/Makefile.in index cc98657d7eb..de3d64cf206 100644 --- a/accessible/tests/mochitest/relations/Makefile.in +++ b/accessible/tests/mochitest/relations/Makefile.in @@ -54,4 +54,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/selectable/Makefile.in b/accessible/tests/mochitest/selectable/Makefile.in index f210e8dcf22..bcc960766b9 100644 --- a/accessible/tests/mochitest/selectable/Makefile.in +++ b/accessible/tests/mochitest/selectable/Makefile.in @@ -55,4 +55,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/states/Makefile.in b/accessible/tests/mochitest/states/Makefile.in index 42ced6f252f..2f75339695b 100644 --- a/accessible/tests/mochitest/states/Makefile.in +++ b/accessible/tests/mochitest/states/Makefile.in @@ -71,4 +71,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/table/Makefile.in b/accessible/tests/mochitest/table/Makefile.in index 650920a244b..0f041935e64 100644 --- a/accessible/tests/mochitest/table/Makefile.in +++ b/accessible/tests/mochitest/table/Makefile.in @@ -69,4 +69,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/text/Makefile.in b/accessible/tests/mochitest/text/Makefile.in index 3612b6f345c..15b33314a2c 100644 --- a/accessible/tests/mochitest/text/Makefile.in +++ b/accessible/tests/mochitest/text/Makefile.in @@ -56,4 +56,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/textselection/Makefile.in b/accessible/tests/mochitest/textselection/Makefile.in index 1a9813c6039..d4a8eacef24 100644 --- a/accessible/tests/mochitest/textselection/Makefile.in +++ b/accessible/tests/mochitest/textselection/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/tree/Makefile.in b/accessible/tests/mochitest/tree/Makefile.in index 6a346808f96..9b767a27a1f 100644 --- a/accessible/tests/mochitest/tree/Makefile.in +++ b/accessible/tests/mochitest/tree/Makefile.in @@ -79,4 +79,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/treeupdate/Makefile.in b/accessible/tests/mochitest/treeupdate/Makefile.in index 1ec8eb3ff65..ca73261c52b 100644 --- a/accessible/tests/mochitest/treeupdate/Makefile.in +++ b/accessible/tests/mochitest/treeupdate/Makefile.in @@ -63,4 +63,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/accessible/tests/mochitest/value/Makefile.in b/accessible/tests/mochitest/value/Makefile.in index 0af305fd95e..4f1bba5d549 100644 --- a/accessible/tests/mochitest/value/Makefile.in +++ b/accessible/tests/mochitest/value/Makefile.in @@ -52,4 +52,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/a11y/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/a11y/$(relativesrcdir) diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index abaaa2a9071..0be8be45af5 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -265,7 +265,7 @@ _BROWSER_FILES += \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/certerror/test/Makefile.in b/browser/components/certerror/test/Makefile.in index 541e2acede5..a7539eea1b4 100644 --- a/browser/components/certerror/test/Makefile.in +++ b/browser/components/certerror/test/Makefile.in @@ -49,5 +49,5 @@ _BROWSER_FILES = browser_bug431826.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/feeds/test/Makefile.in b/browser/components/feeds/test/Makefile.in index fb4687ab8b7..a61978a6962 100644 --- a/browser/components/feeds/test/Makefile.in +++ b/browser/components/feeds/test/Makefile.in @@ -61,4 +61,4 @@ _TEST_FILES = bug408328-data.xml \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/browser/components/feeds/test/chrome/Makefile.in b/browser/components/feeds/test/chrome/Makefile.in index 9a668329d68..cf48dc6d4b5 100644 --- a/browser/components/feeds/test/chrome/Makefile.in +++ b/browser/components/feeds/test/chrome/Makefile.in @@ -56,8 +56,8 @@ _CHROME_FILES = \ $(NULL) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/browser/components/places/tests/browser/Makefile.in b/browser/components/places/tests/browser/Makefile.in index 267559e682e..1ba7dccad0f 100644 --- a/browser/components/places/tests/browser/Makefile.in +++ b/browser/components/places/tests/browser/Makefile.in @@ -79,4 +79,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/places/tests/chrome/Makefile.in b/browser/components/places/tests/chrome/Makefile.in index 7f56971e05e..e4512a7de19 100644 --- a/browser/components/places/tests/chrome/Makefile.in +++ b/browser/components/places/tests/chrome/Makefile.in @@ -56,4 +56,4 @@ _CHROME_TEST_FILES = \ $(NULL) libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in index 9f93d562b85..5c148b37511 100644 --- a/browser/components/preferences/tests/Makefile.in +++ b/browser/components/preferences/tests/Makefile.in @@ -60,4 +60,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/privatebrowsing/test/browser/Makefile.in b/browser/components/privatebrowsing/test/browser/Makefile.in index 4e55e833c1b..11c3ac72f25 100644 --- a/browser/components/privatebrowsing/test/browser/Makefile.in +++ b/browser/components/privatebrowsing/test/browser/Makefile.in @@ -99,4 +99,4 @@ _BROWSER_TEST_FILES += \ endif libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/safebrowsing/content/test/Makefile.in b/browser/components/safebrowsing/content/test/Makefile.in index 99793530649..83ac5d724ac 100644 --- a/browser/components/safebrowsing/content/test/Makefile.in +++ b/browser/components/safebrowsing/content/test/Makefile.in @@ -56,5 +56,5 @@ _BROWSER_FILES = browser_bug400731.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/search/test/Makefile.in b/browser/components/search/test/Makefile.in index ebf70e8b88e..1fe01b3f2d9 100644 --- a/browser/components/search/test/Makefile.in +++ b/browser/components/search/test/Makefile.in @@ -57,4 +57,4 @@ _BROWSER_TEST_FILES = browser_405664.js \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/sessionstore/test/browser/Makefile.in b/browser/components/sessionstore/test/browser/Makefile.in index 532a09517d6..e59fccc4514 100644 --- a/browser/components/sessionstore/test/browser/Makefile.in +++ b/browser/components/sessionstore/test/browser/Makefile.in @@ -168,4 +168,4 @@ _BROWSER_TEST_FILES += \ endif libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/shell/test/Makefile.in b/browser/components/shell/test/Makefile.in index fb96b210155..2c87443e7f9 100644 --- a/browser/components/shell/test/Makefile.in +++ b/browser/components/shell/test/Makefile.in @@ -52,4 +52,4 @@ _BROWSER_TEST_FILES = browser_420786.js \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/tabview/test/Makefile.in b/browser/components/tabview/test/Makefile.in index e5f8b0a75d2..7e858a7f5b2 100644 --- a/browser/components/tabview/test/Makefile.in +++ b/browser/components/tabview/test/Makefile.in @@ -189,4 +189,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/test/browser/Makefile.in b/browser/components/test/browser/Makefile.in index 368900d99a3..8d2a216110b 100644 --- a/browser/components/test/browser/Makefile.in +++ b/browser/components/test/browser/Makefile.in @@ -49,4 +49,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/components/wintaskbar/test/Makefile.in b/browser/components/wintaskbar/test/Makefile.in index 7fc38db7386..0230e41851e 100644 --- a/browser/components/wintaskbar/test/Makefile.in +++ b/browser/components/wintaskbar/test/Makefile.in @@ -49,6 +49,6 @@ _BROWSER_FILES = browser_taskbar_preview.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/highlighter/test/Makefile.in b/browser/devtools/highlighter/test/Makefile.in index 8e1ec8a0d9a..0705e1d9cd8 100644 --- a/browser/devtools/highlighter/test/Makefile.in +++ b/browser/devtools/highlighter/test/Makefile.in @@ -71,4 +71,4 @@ _BROWSER_FILES = \ # browser_inspector_treePanel_click.js \ libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/scratchpad/test/Makefile.in b/browser/devtools/scratchpad/test/Makefile.in index 752b192fc46..ea528144295 100644 --- a/browser/devtools/scratchpad/test/Makefile.in +++ b/browser/devtools/scratchpad/test/Makefile.in @@ -59,4 +59,4 @@ _BROWSER_TEST_FILES = \ browser_scratchpad_bug_699130_edit_ui_updates.js \ libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in index 329d47b576b..53a4fb5b506 100644 --- a/browser/devtools/shared/test/Makefile.in +++ b/browser/devtools/shared/test/Makefile.in @@ -57,7 +57,7 @@ _BROWSER_TEST_PAGES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_BROWSER_TEST_PAGES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/sourceeditor/test/Makefile.in b/browser/devtools/sourceeditor/test/Makefile.in index a69f3d357c8..f72df271098 100644 --- a/browser/devtools/sourceeditor/test/Makefile.in +++ b/browser/devtools/sourceeditor/test/Makefile.in @@ -52,4 +52,4 @@ _BROWSER_TEST_FILES = \ browser_bug687580_drag_and_drop.js \ libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/styleinspector/test/browser/Makefile.in b/browser/devtools/styleinspector/test/browser/Makefile.in index 994365070da..f53cc206d58 100644 --- a/browser/devtools/styleinspector/test/browser/Makefile.in +++ b/browser/devtools/styleinspector/test/browser/Makefile.in @@ -65,7 +65,7 @@ _BROWSER_TEST_PAGES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_BROWSER_TEST_PAGES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/devtools/webconsole/test/browser/Makefile.in b/browser/devtools/webconsole/test/browser/Makefile.in index 078afc9fdf6..06f43b751db 100644 --- a/browser/devtools/webconsole/test/browser/Makefile.in +++ b/browser/devtools/webconsole/test/browser/Makefile.in @@ -225,7 +225,7 @@ _BROWSER_TEST_PAGES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_BROWSER_TEST_PAGES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/browser/fuel/test/Makefile.in b/browser/fuel/test/Makefile.in index 8c94cc39492..87bf8d34d95 100644 --- a/browser/fuel/test/Makefile.in +++ b/browser/fuel/test/Makefile.in @@ -56,4 +56,4 @@ _BROWSER_FILES =browser_Application.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/caps/tests/mochitest/Makefile.in b/caps/tests/mochitest/Makefile.in index 910d99d4c6c..c20666f58bb 100644 --- a/caps/tests/mochitest/Makefile.in +++ b/caps/tests/mochitest/Makefile.in @@ -58,4 +58,4 @@ test_bug292789.html : % : %.in GARBAGE += test_bug292789.html libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/config/config.mk b/config/config.mk index f7d6503e6ce..eb99f1e6b68 100644 --- a/config/config.mk +++ b/config/config.mk @@ -56,10 +56,6 @@ ifndef topsrcdir topsrcdir = $(DEPTH) endif -ifndef mochitestdir -mochitestdir = _mochitest -endif - ifndef INCLUDED_AUTOCONF_MK include $(DEPTH)/config/autoconf.mk endif diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index d251157242b..ff89a7c1744 100644 --- a/content/base/test/Makefile.in +++ b/content/base/test/Makefile.in @@ -546,14 +546,14 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES1) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES2) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/base/test/chrome/Makefile.in b/content/base/test/chrome/Makefile.in index 81fe67d1fdc..df6d78df13f 100644 --- a/content/base/test/chrome/Makefile.in +++ b/content/base/test/chrome/Makefile.in @@ -74,7 +74,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/canvas/test/Makefile.in b/content/canvas/test/Makefile.in index 33aacbae139..1404414d537 100644 --- a/content/canvas/test/Makefile.in +++ b/content/canvas/test/Makefile.in @@ -179,4 +179,4 @@ endif # split up into groups to work around command-line length limits libs:: $(_TEST_FILES_0) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/canvas/test/crossorigin/Makefile.in b/content/canvas/test/crossorigin/Makefile.in index 2dbc037c722..ce009e1d836 100644 --- a/content/canvas/test/crossorigin/Makefile.in +++ b/content/canvas/test/crossorigin/Makefile.in @@ -54,4 +54,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/canvas/test/webgl/Makefile.in b/content/canvas/test/webgl/Makefile.in index 287d39d1f70..1af1623aa17 100644 --- a/content/canvas/test/webgl/Makefile.in +++ b/content/canvas/test/webgl/Makefile.in @@ -52,8 +52,8 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) $(TAR) -cf - -C $(srcdir) \ resources \ conformance \ - | $(TAR) -xf - -C $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + | $(TAR) -xf - -C $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in index cff6c6009a2..707613f0146 100644 --- a/content/events/test/Makefile.in +++ b/content/events/test/Makefile.in @@ -147,7 +147,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in index 1d6f5cc20cb..104a8c7847e 100644 --- a/content/html/content/test/Makefile.in +++ b/content/html/content/test/Makefile.in @@ -293,4 +293,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/html/content/test/bug649134/Makefile.in b/content/html/content/test/bug649134/Makefile.in index 1bbe1fb7b21..732ba5dbcfe 100644 --- a/content/html/content/test/bug649134/Makefile.in +++ b/content/html/content/test/bug649134/Makefile.in @@ -47,4 +47,4 @@ include $(topsrcdir)/config/rules.mk _TEST_FILES = file_bug649134-1.sjs file_bug649134-2.sjs index.html libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/html/content/test/forms/Makefile.in b/content/html/content/test/forms/Makefile.in index 204a9889867..3a9b9266284 100644 --- a/content/html/content/test/forms/Makefile.in +++ b/content/html/content/test/forms/Makefile.in @@ -67,5 +67,5 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in index a244143f029..7edd3396430 100644 --- a/content/html/document/test/Makefile.in +++ b/content/html/document/test/Makefile.in @@ -115,9 +115,9 @@ _BROWSER_TEST_FILES = \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) ifneq (mobile,$(MOZ_BUILD_APP)) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) endif diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in index a4b49bcded9..b1c20ffc5ac 100644 --- a/content/media/test/Makefile.in +++ b/content/media/test/Makefile.in @@ -303,4 +303,4 @@ _TEST_FILES += \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/smil/test/Makefile.in b/content/smil/test/Makefile.in index e9e3258fc4a..a0a88f5a55e 100644 --- a/content/smil/test/Makefile.in +++ b/content/smil/test/Makefile.in @@ -96,4 +96,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/svg/content/test/Makefile.in b/content/svg/content/test/Makefile.in index 98835b59d66..09aec53550d 100644 --- a/content/svg/content/test/Makefile.in +++ b/content/svg/content/test/Makefile.in @@ -106,4 +106,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in index b23e66b4774..83f26714898 100644 --- a/content/xbl/test/Makefile.in +++ b/content/xbl/test/Makefile.in @@ -82,8 +82,8 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/xml/document/test/Makefile.in b/content/xml/document/test/Makefile.in index 11a3d45bb7c..1ac021be3c4 100644 --- a/content/xml/document/test/Makefile.in +++ b/content/xml/document/test/Makefile.in @@ -58,4 +58,4 @@ _TEST_FILES = test_bug232004.xhtml \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in index 123676e2898..be1d8356ad5 100644 --- a/content/xslt/tests/mochitest/Makefile.in +++ b/content/xslt/tests/mochitest/Makefile.in @@ -60,4 +60,4 @@ _TEST_FILES = test_bug319374.xhtml \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/content/xul/content/test/Makefile.in b/content/xul/content/test/Makefile.in index b9de02be034..2057ea8c5ff 100644 --- a/content/xul/content/test/Makefile.in +++ b/content/xul/content/test/Makefile.in @@ -56,7 +56,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/xul/document/test/Makefile.in b/content/xul/document/test/Makefile.in index 94770ba6cc4..c2c85936dfe 100644 --- a/content/xul/document/test/Makefile.in +++ b/content/xul/document/test/Makefile.in @@ -64,4 +64,4 @@ _CHROME_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in index c6791c4407a..a46c2998178 100644 --- a/content/xul/templates/tests/chrome/Makefile.in +++ b/content/xul/templates/tests/chrome/Makefile.in @@ -266,4 +266,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in index 0742311fee6..e8ce5c3e5ab 100644 --- a/docshell/test/Makefile.in +++ b/docshell/test/Makefile.in @@ -132,4 +132,4 @@ _TEST_FILES += \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/docshell/test/browser/Makefile.in b/docshell/test/browser/Makefile.in index 8284fa92318..14d3132d194 100644 --- a/docshell/test/browser/Makefile.in +++ b/docshell/test/browser/Makefile.in @@ -68,4 +68,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/docshell/test/chrome/Makefile.in b/docshell/test/chrome/Makefile.in index 06388c6c8af..b92291c281f 100644 --- a/docshell/test/chrome/Makefile.in +++ b/docshell/test/chrome/Makefile.in @@ -130,10 +130,10 @@ _DOCSHELL_SUBHARNESS = \ $(NULL) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(_DOCSHELL_SUBHARNESS) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/docshell/test/navigation/Makefile.in b/docshell/test/navigation/Makefile.in index 17d33f04420..3b4121b4a73 100644 --- a/docshell/test/navigation/Makefile.in +++ b/docshell/test/navigation/Makefile.in @@ -94,9 +94,9 @@ _BROWSER_TEST_FILES = \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) ifneq (mobile,$(MOZ_BUILD_APP)) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) endif diff --git a/dom/indexedDB/test/Makefile.in b/dom/indexedDB/test/Makefile.in index cbbbf215625..1997f7ef262 100644 --- a/dom/indexedDB/test/Makefile.in +++ b/dom/indexedDB/test/Makefile.in @@ -124,9 +124,9 @@ BROWSER_TEST_FILES = \ $(NULL) libs:: $(BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) endif libs:: $(TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/ipc/tests/Makefile.in b/dom/ipc/tests/Makefile.in index f8cd3fa62ae..8d9f07b5144 100644 --- a/dom/ipc/tests/Makefile.in +++ b/dom/ipc/tests/Makefile.in @@ -50,4 +50,4 @@ MOCHICHROME_FILES = \ $(NULL) libs:: $(MOCHICHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/plugins/test/mochitest/Makefile.in b/dom/plugins/test/mochitest/Makefile.in index 94268112fbf..5d7d2e07a02 100644 --- a/dom/plugins/test/mochitest/Makefile.in +++ b/dom/plugins/test/mochitest/Makefile.in @@ -169,7 +169,7 @@ _MOCHITEST_FILES += \ endif libs:: $(_MOCHICHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(_MOCHITEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/src/foo/Makefile.in b/dom/src/foo/Makefile.in index 194af9eafbf..759adbf6132 100644 --- a/dom/src/foo/Makefile.in +++ b/dom/src/foo/Makefile.in @@ -52,4 +52,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/src/json/test/Makefile.in b/dom/src/json/test/Makefile.in index f90aaa6feea..2f5b7c2f479 100644 --- a/dom/src/json/test/Makefile.in +++ b/dom/src/json/test/Makefile.in @@ -53,5 +53,5 @@ include $(topsrcdir)/config/rules.mk $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/src/jsurl/test/Makefile.in b/dom/src/jsurl/test/Makefile.in index a4361b31e1e..7d8fceff07f 100644 --- a/dom/src/jsurl/test/Makefile.in +++ b/dom/src/jsurl/test/Makefile.in @@ -59,4 +59,4 @@ _TEST_FILES = pass.html \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/browser/Makefile.in b/dom/tests/browser/Makefile.in index 08ec7000c57..e240e1b7998 100644 --- a/dom/tests/browser/Makefile.in +++ b/dom/tests/browser/Makefile.in @@ -58,4 +58,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/Makefile.in b/dom/tests/mochitest/ajax/jquery/Makefile.in index 397e649cc97..aef5a2de296 100644 --- a/dom/tests/mochitest/ajax/jquery/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/Makefile.in @@ -56,4 +56,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in index ddf4223697b..60c3617ebfe 100644 --- a/dom/tests/mochitest/ajax/jquery/dist/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/dist/Makefile.in @@ -53,4 +53,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/test/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/Makefile.in index ac87fd17daa..4e9518572df 100644 --- a/dom/tests/mochitest/ajax/jquery/test/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/Makefile.in @@ -58,4 +58,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in index 34d796298d6..6236e51ef0a 100644 --- a/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/data/Makefile.in @@ -66,4 +66,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in index 92d1ca1f803..acc7e4eea05 100644 --- a/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/data/offset/Makefile.in @@ -58,4 +58,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in index 3296e63ef45..47f51fd8edd 100644 --- a/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/jquery/test/unit/Makefile.in @@ -59,4 +59,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/lib/Makefile.in b/dom/tests/mochitest/ajax/lib/Makefile.in index 8ef3626f624..53507f12d74 100644 --- a/dom/tests/mochitest/ajax/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/lib/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/mochikit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/Makefile.in index d99d542682e..3876c1f4713 100644 --- a/dom/tests/mochitest/ajax/mochikit/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/Makefile.in @@ -56,4 +56,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in index 2fd675088ee..d42a9452573 100644 --- a/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/MochiKit/Makefile.in @@ -70,4 +70,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in index 99c76d76aff..527b699d9fe 100644 --- a/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/tests/Makefile.in @@ -81,4 +81,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in index 29135500a2d..a256437c29e 100644 --- a/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in +++ b/dom/tests/mochitest/ajax/mochikit/tests/SimpleTest/Makefile.in @@ -54,4 +54,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/offline/Makefile.in b/dom/tests/mochitest/ajax/offline/Makefile.in index 19ce9fba103..a8ea2b458d4 100644 --- a/dom/tests/mochitest/ajax/offline/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/Makefile.in @@ -125,4 +125,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in index 479a62e5699..94f2caf8f59 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/Makefile.in @@ -54,4 +54,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in index 2a24f98324a..25ebc4f51d8 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/sub/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in index f54dd11a48c..a4987297ae1 100644 --- a/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace1/sub2/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in index 8ba98e0c574..77164c9b53f 100644 --- a/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in +++ b/dom/tests/mochitest/ajax/offline/namespace2/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/Makefile.in b/dom/tests/mochitest/ajax/prototype/Makefile.in index c5e4e92b300..6be8a162dfa 100644 --- a/dom/tests/mochitest/ajax/prototype/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/Makefile.in @@ -57,4 +57,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in index ae754ddc2e3..7e58a7b15a4 100644 --- a/dom/tests/mochitest/ajax/prototype/dist/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/dist/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/Makefile.in index cd30aea97fd..d33ec708689 100644 --- a/dom/tests/mochitest/ajax/prototype/test/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/Makefile.in @@ -59,4 +59,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in index 994cacd3162..1eb181e0e19 100644 --- a/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/functional/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in index 49af3c08e0c..3586696d020 100644 --- a/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/lib/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in index 36d0a41788e..eccf6094d00 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/Makefile.in @@ -70,4 +70,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in index 02d593cf746..c36ec746218 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/fixtures/Makefile.in @@ -74,4 +74,4 @@ _TEST_FILES= \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in index bac7c93a999..91342744a89 100644 --- a/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in +++ b/dom/tests/mochitest/ajax/prototype/test/unit/tmp/Makefile.in @@ -64,4 +64,4 @@ _TEST_FILES= \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in index 002a3aa4ebd..469f94fc534 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/Makefile.in @@ -57,4 +57,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in index 5da2c66fb4d..d8781b82fcc 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/lib/Makefile.in @@ -53,4 +53,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in index b643613ae07..2b751c5ab79 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/src/Makefile.in @@ -60,4 +60,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in index abe4b30264d..e89b101b21f 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in +++ b/dom/tests/mochitest/ajax/scriptaculous/test/unit/Makefile.in @@ -71,4 +71,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/bugs/Makefile.in b/dom/tests/mochitest/bugs/Makefile.in index 84058e944e8..62eaf858add 100644 --- a/dom/tests/mochitest/bugs/Makefile.in +++ b/dom/tests/mochitest/bugs/Makefile.in @@ -155,4 +155,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in index c2dbce246b4..2a6b90897cc 100644 --- a/dom/tests/mochitest/chrome/Makefile.in +++ b/dom/tests/mochitest/chrome/Makefile.in @@ -82,4 +82,4 @@ _TEST_FILES += \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level0/Makefile.in b/dom/tests/mochitest/dom-level0/Makefile.in index 8a12b0dae1d..a08896bb4a8 100644 --- a/dom/tests/mochitest/dom-level0/Makefile.in +++ b/dom/tests/mochitest/dom-level0/Makefile.in @@ -59,4 +59,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level1-core/Makefile.in b/dom/tests/mochitest/dom-level1-core/Makefile.in index 3135da79885..fec2f588e26 100644 --- a/dom/tests/mochitest/dom-level1-core/Makefile.in +++ b/dom/tests/mochitest/dom-level1-core/Makefile.in @@ -604,22 +604,22 @@ _TEST_FILES_G = \ # work around command-line length limits by splitting into groups libs:: $(_TEST_FILES_A) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_B) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_C) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_D) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_E) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_F) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_G) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level1-core/files/Makefile.in b/dom/tests/mochitest/dom-level1-core/files/Makefile.in index 884c862bdd4..0f0893ce71b 100644 --- a/dom/tests/mochitest/dom-level1-core/files/Makefile.in +++ b/dom/tests/mochitest/dom-level1-core/files/Makefile.in @@ -67,4 +67,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level2-core/Makefile.in b/dom/tests/mochitest/dom-level2-core/Makefile.in index 72000b03ec8..306efaf1ce8 100644 --- a/dom/tests/mochitest/dom-level2-core/Makefile.in +++ b/dom/tests/mochitest/dom-level2-core/Makefile.in @@ -330,19 +330,19 @@ _TEST_FILES_F = \ # work around nsinstall limits on windows by splitting into groups libs:: $(_TEST_FILES_A) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_B) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_C) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_D) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_E) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_F) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level2-core/files/Makefile.in b/dom/tests/mochitest/dom-level2-core/files/Makefile.in index de39f2cd2c2..b4f7986fd3d 100644 --- a/dom/tests/mochitest/dom-level2-core/files/Makefile.in +++ b/dom/tests/mochitest/dom-level2-core/files/Makefile.in @@ -72,4 +72,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level2-html/Makefile.in b/dom/tests/mochitest/dom-level2-html/Makefile.in index c0dcf7c7273..d788d1ddbbe 100644 --- a/dom/tests/mochitest/dom-level2-html/Makefile.in +++ b/dom/tests/mochitest/dom-level2-html/Makefile.in @@ -745,14 +745,14 @@ _TEST_FILES_F = \ # work around nsinstall limits on windows by splitting into groups libs:: $(_TEST_FILES_A) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_B) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_C) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_D) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_E) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) #libs:: $(_TEST_FILES_F) -# $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) +# $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/dom-level2-html/files/Makefile.in b/dom/tests/mochitest/dom-level2-html/files/Makefile.in index 26b6c76a301..4b672ca12fa 100644 --- a/dom/tests/mochitest/dom-level2-html/files/Makefile.in +++ b/dom/tests/mochitest/dom-level2-html/files/Makefile.in @@ -256,7 +256,7 @@ _TEST_FILES_J = \ applets/org/w3c/domts/DOMTSApplet.class \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_TEST_FILES_J) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir)/applets/org/w3c/domts + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/applets/org/w3c/domts diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in index 839bff986b6..d548a8ebfbf 100644 --- a/dom/tests/mochitest/general/Makefile.in +++ b/dom/tests/mochitest/general/Makefile.in @@ -79,7 +79,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/tests/mochitest/geolocation/Makefile.in b/dom/tests/mochitest/geolocation/Makefile.in index d0bb989280c..becbf0b597a 100644 --- a/dom/tests/mochitest/geolocation/Makefile.in +++ b/dom/tests/mochitest/geolocation/Makefile.in @@ -67,5 +67,5 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/globalstorage/Makefile.in b/dom/tests/mochitest/globalstorage/Makefile.in index a94d5faf27b..199e7a68203 100644 --- a/dom/tests/mochitest/globalstorage/Makefile.in +++ b/dom/tests/mochitest/globalstorage/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/localstorage/Makefile.in b/dom/tests/mochitest/localstorage/Makefile.in index f8b5fe88a9a..76b805fca8b 100644 --- a/dom/tests/mochitest/localstorage/Makefile.in +++ b/dom/tests/mochitest/localstorage/Makefile.in @@ -95,6 +95,6 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/tests/mochitest/notification/Makefile.in b/dom/tests/mochitest/notification/Makefile.in index 78e19ac04d6..631f8f6b5f5 100644 --- a/dom/tests/mochitest/notification/Makefile.in +++ b/dom/tests/mochitest/notification/Makefile.in @@ -52,5 +52,5 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/orientation/Makefile.in b/dom/tests/mochitest/orientation/Makefile.in index db6aaafa198..26f070525b4 100644 --- a/dom/tests/mochitest/orientation/Makefile.in +++ b/dom/tests/mochitest/orientation/Makefile.in @@ -49,5 +49,5 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/sessionstorage/Makefile.in b/dom/tests/mochitest/sessionstorage/Makefile.in index 21472da3f5b..3036cbb703d 100644 --- a/dom/tests/mochitest/sessionstorage/Makefile.in +++ b/dom/tests/mochitest/sessionstorage/Makefile.in @@ -64,6 +64,6 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/tests/mochitest/storageevent/Makefile.in b/dom/tests/mochitest/storageevent/Makefile.in index 198d1ed6760..2cd91eff3ab 100644 --- a/dom/tests/mochitest/storageevent/Makefile.in +++ b/dom/tests/mochitest/storageevent/Makefile.in @@ -68,4 +68,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/dom/tests/mochitest/whatwg/Makefile.in b/dom/tests/mochitest/whatwg/Makefile.in index 356cefec25e..e9a1a5c3b91 100644 --- a/dom/tests/mochitest/whatwg/Makefile.in +++ b/dom/tests/mochitest/whatwg/Makefile.in @@ -91,7 +91,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/workers/test/Makefile.in b/dom/workers/test/Makefile.in index f39bd9c1780..990d9431d46 100644 --- a/dom/workers/test/Makefile.in +++ b/dom/workers/test/Makefile.in @@ -165,10 +165,10 @@ _TEST_FILES += \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_SUBDIR_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir)/subdir + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/subdir libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/dom/workers/test/extensions/bootstrap/Makefile.in b/dom/workers/test/extensions/bootstrap/Makefile.in index 5b9a7af275b..982be6324a7 100644 --- a/dom/workers/test/extensions/bootstrap/Makefile.in +++ b/dom/workers/test/extensions/bootstrap/Makefile.in @@ -50,7 +50,7 @@ DIST_FILES = \ worker.js \ $(NULL) -TEST_EXTENSIONS_DIR = $(DEPTH)/$(mochitestdir)/extensions +TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions include $(topsrcdir)/config/rules.mk diff --git a/dom/workers/test/extensions/traditional/Makefile.in b/dom/workers/test/extensions/traditional/Makefile.in index defa6794dd7..2b12cb9ba9e 100644 --- a/dom/workers/test/extensions/traditional/Makefile.in +++ b/dom/workers/test/extensions/traditional/Makefile.in @@ -59,7 +59,7 @@ DIST_FILES = \ worker.js \ $(NULL) -TEST_EXTENSIONS_DIR = $(DEPTH)/$(mochitestdir)/extensions +TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions include $(topsrcdir)/config/rules.mk diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in index 57192607987..46274d28fef 100644 --- a/editor/composer/test/Makefile.in +++ b/editor/composer/test/Makefile.in @@ -59,7 +59,7 @@ _CHROME_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/editor/libeditor/base/tests/Makefile.in b/editor/libeditor/base/tests/Makefile.in index 784d03626f7..b697234bbbb 100644 --- a/editor/libeditor/base/tests/Makefile.in +++ b/editor/libeditor/base/tests/Makefile.in @@ -59,8 +59,8 @@ _CHROME_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/editor/libeditor/html/tests/Makefile.in b/editor/libeditor/html/tests/Makefile.in index af1a43970ec..c702714eafd 100644 --- a/editor/libeditor/html/tests/Makefile.in +++ b/editor/libeditor/html/tests/Makefile.in @@ -121,12 +121,12 @@ _CHROME_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) - (cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - browserscope 2> /dev/null) | (cd $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) && tar -xf -) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) + (cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - browserscope 2> /dev/null) | (cd $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) && tar -xf -) libs:: $(_DATA_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir)/data + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/data libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/editor/libeditor/text/tests/Makefile.in b/editor/libeditor/text/tests/Makefile.in index 58f73f2e9f7..2b686d4811e 100644 --- a/editor/libeditor/text/tests/Makefile.in +++ b/editor/libeditor/text/tests/Makefile.in @@ -81,8 +81,8 @@ _CHROME_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/embedding/test/Makefile.in b/embedding/test/Makefile.in index 7ce0614ed52..735a6e96057 100644 --- a/embedding/test/Makefile.in +++ b/embedding/test/Makefile.in @@ -55,4 +55,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in index 93fd9f9b93b..2bd0b08dda8 100644 --- a/extensions/cookie/test/Makefile.in +++ b/extensions/cookie/test/Makefile.in @@ -89,10 +89,10 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) XPCSHELL_TESTS = unit diff --git a/extensions/spellcheck/tests/chrome/Makefile.in b/extensions/spellcheck/tests/chrome/Makefile.in index d87d93dd653..da60413beb7 100644 --- a/extensions/spellcheck/tests/chrome/Makefile.in +++ b/extensions/spellcheck/tests/chrome/Makefile.in @@ -51,4 +51,4 @@ _TEST_FILES = test_add_remove_dictionaries.xul \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/extensions/spellcheck/tests/chrome/base/Makefile.in b/extensions/spellcheck/tests/chrome/base/Makefile.in index 669cdf5944f..04159b2ca7a 100644 --- a/extensions/spellcheck/tests/chrome/base/Makefile.in +++ b/extensions/spellcheck/tests/chrome/base/Makefile.in @@ -49,4 +49,4 @@ _TEST_FILES = base_utf.dic \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/extensions/spellcheck/tests/chrome/map/Makefile.in b/extensions/spellcheck/tests/chrome/map/Makefile.in index ea89d52dd57..f9da7553bee 100644 --- a/extensions/spellcheck/tests/chrome/map/Makefile.in +++ b/extensions/spellcheck/tests/chrome/map/Makefile.in @@ -49,4 +49,4 @@ _TEST_FILES = maputf.dic \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/extensions/universalchardet/tests/Makefile.in b/extensions/universalchardet/tests/Makefile.in index 81703d69626..3dd12b787e3 100644 --- a/extensions/universalchardet/tests/Makefile.in +++ b/extensions/universalchardet/tests/Makefile.in @@ -79,4 +79,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index c2de2a37391..638f0c49e01 100644 --- a/gfx/tests/Makefile.in +++ b/gfx/tests/Makefile.in @@ -117,4 +117,4 @@ endif libs:: $(_TEST_FILES) $(INSTALL) $(foreach f,$^,"$f") \ - $(DEPTH)/$(mochitestdir)/tests/gfx + $(DEPTH)/_tests/testing/mochitest/tests/gfx diff --git a/image/test/browser/Makefile.in b/image/test/browser/Makefile.in index e72677b0d41..43e2294035d 100644 --- a/image/test/browser/Makefile.in +++ b/image/test/browser/Makefile.in @@ -54,5 +54,5 @@ _BROWSER_FILES = head.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/image/test/mochitest/Makefile.in b/image/test/mochitest/Makefile.in index fe20d065c46..0e3651f3dcd 100644 --- a/image/test/mochitest/Makefile.in +++ b/image/test/mochitest/Makefile.in @@ -98,7 +98,7 @@ _CHROME_FILES = imgutils.js \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in index 4cb995f7caf..d1736003933 100644 --- a/intl/uconv/tests/Makefile.in +++ b/intl/uconv/tests/Makefile.in @@ -73,6 +73,6 @@ _TEST_FILES = \ test_utf8_overconsumption.html \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) include $(topsrcdir)/config/rules.mk diff --git a/js/jetpack/tests/Makefile.in b/js/jetpack/tests/Makefile.in index 7385f3e8f5f..6794b6fb91f 100644 --- a/js/jetpack/tests/Makefile.in +++ b/js/jetpack/tests/Makefile.in @@ -56,5 +56,5 @@ MOCHICHROME_FILES = \ $(NULL) libs:: $(MOCHICHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) endif diff --git a/js/jsd/test/Makefile.in b/js/jsd/test/Makefile.in index 15f9f7e936f..22c6e76eb81 100644 --- a/js/jsd/test/Makefile.in +++ b/js/jsd/test/Makefile.in @@ -53,4 +53,4 @@ _TEST_FILES = test_bug507448.html bug507448.js \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/js/src/config/config.mk b/js/src/config/config.mk index f7d6503e6ce..eb99f1e6b68 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -56,10 +56,6 @@ ifndef topsrcdir topsrcdir = $(DEPTH) endif -ifndef mochitestdir -mochitestdir = _mochitest -endif - ifndef INCLUDED_AUTOCONF_MK include $(DEPTH)/config/autoconf.mk endif diff --git a/js/xpconnect/tests/chrome/Makefile.in b/js/xpconnect/tests/chrome/Makefile.in index fde9c644f17..ad41e3027da 100644 --- a/js/xpconnect/tests/chrome/Makefile.in +++ b/js/xpconnect/tests/chrome/Makefile.in @@ -80,4 +80,4 @@ _CHROME_FILES = \ # test_wrappers-2.xul \ libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/js/xpconnect/tests/mochitest/Makefile.in b/js/xpconnect/tests/mochitest/Makefile.in index 4330393f13f..a2b24bab77c 100644 --- a/js/xpconnect/tests/mochitest/Makefile.in +++ b/js/xpconnect/tests/mochitest/Makefile.in @@ -112,8 +112,8 @@ endif #test_bug484107.html \ libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index abfc525ef47..16154bf6e3d 100644 --- a/layout/base/tests/Makefile.in +++ b/layout/base/tests/Makefile.in @@ -358,9 +358,9 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) check:: @$(EXIT_ON_ERROR) \ diff --git a/layout/base/tests/chrome/Makefile.in b/layout/base/tests/chrome/Makefile.in index f8aa76d074c..7dbcaa0ec2e 100644 --- a/layout/base/tests/chrome/Makefile.in +++ b/layout/base/tests/chrome/Makefile.in @@ -71,4 +71,4 @@ _CHROME_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in index d57deb9e4d6..40c5681b7a0 100644 --- a/layout/forms/test/Makefile.in +++ b/layout/forms/test/Makefile.in @@ -87,7 +87,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/layout/generic/test/Makefile.in b/layout/generic/test/Makefile.in index 37979f09372..0b41c8c70de 100644 --- a/layout/generic/test/Makefile.in +++ b/layout/generic/test/Makefile.in @@ -139,7 +139,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in index 0b2e25fc425..72e958cb695 100644 --- a/layout/inspector/tests/Makefile.in +++ b/layout/inspector/tests/Makefile.in @@ -55,4 +55,4 @@ _TEST_FILES =\ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/layout/inspector/tests/chrome/Makefile.in b/layout/inspector/tests/chrome/Makefile.in index 37154731126..aac68770d0a 100644 --- a/layout/inspector/tests/chrome/Makefile.in +++ b/layout/inspector/tests/chrome/Makefile.in @@ -53,4 +53,4 @@ _CHROME_FILES =\ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/layout/reftests/fonts/Makefile.in b/layout/reftests/fonts/Makefile.in index 5d83fcb6671..bc0be57c4c0 100644 --- a/layout/reftests/fonts/Makefile.in +++ b/layout/reftests/fonts/Makefile.in @@ -47,4 +47,4 @@ _TEST_FILES = Ahem.ttf \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/fonts + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/fonts diff --git a/layout/reftests/fonts/mplus/Makefile.in b/layout/reftests/fonts/mplus/Makefile.in index 22099e1c47e..04468eb528a 100644 --- a/layout/reftests/fonts/mplus/Makefile.in +++ b/layout/reftests/fonts/mplus/Makefile.in @@ -47,4 +47,4 @@ _TEST_FILES = mplus-1p-regular.ttf \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/fonts/mplus + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/fonts/mplus diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in index d2ca0245d39..bb0c4d5bdec 100644 --- a/layout/style/test/Makefile.in +++ b/layout/style/test/Makefile.in @@ -247,12 +247,12 @@ _BROWSER_FILES = \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_VISITED_REFTEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir)/css-visited/ + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)/css-visited/ ifneq (mobile,$(MOZ_BUILD_APP)) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) endif diff --git a/layout/style/test/chrome/Makefile.in b/layout/style/test/chrome/Makefile.in index edf4418b4a6..482fa6b1b58 100644 --- a/layout/style/test/chrome/Makefile.in +++ b/layout/style/test/chrome/Makefile.in @@ -58,7 +58,7 @@ _TEST_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/layout/tables/test/Makefile.in b/layout/tables/test/Makefile.in index 481b3af2f82..9d8d459768a 100644 --- a/layout/tables/test/Makefile.in +++ b/layout/tables/test/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/layout/xul/base/test/Makefile.in b/layout/xul/base/test/Makefile.in index ee08e7c103e..1fe3f355b9a 100644 --- a/layout/xul/base/test/Makefile.in +++ b/layout/xul/base/test/Makefile.in @@ -64,7 +64,7 @@ _CHROME_FILES += test_resizer.xul \ endif libs:: $(_CHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/layout/xul/test/Makefile.in b/layout/xul/test/Makefile.in index 501e2cdc6f2..0c2ac2828be 100644 --- a/layout/xul/test/Makefile.in +++ b/layout/xul/test/Makefile.in @@ -57,7 +57,7 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in index 3f1ce48db6b..70d82341506 100644 --- a/mobile/chrome/tests/Makefile.in +++ b/mobile/chrome/tests/Makefile.in @@ -40,7 +40,7 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = mobile/chrome/tests -TESTXPI = $(CURDIR)/$(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir)/addons +TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons ADDONSRC = $(srcdir)/addons include $(DEPTH)/config/autoconf.mk @@ -127,7 +127,7 @@ endif endif libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: rm -rf $(TESTXPI) diff --git a/modules/libjar/test/chrome/Makefile.in b/modules/libjar/test/chrome/Makefile.in index b5d4ce49039..c25235a86a2 100644 --- a/modules/libjar/test/chrome/Makefile.in +++ b/modules/libjar/test/chrome/Makefile.in @@ -54,4 +54,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/modules/libjar/test/mochitest/Makefile.in b/modules/libjar/test/mochitest/Makefile.in index 9bb7590e400..ca7df17302e 100644 --- a/modules/libjar/test/mochitest/Makefile.in +++ b/modules/libjar/test/mochitest/Makefile.in @@ -52,4 +52,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/netwerk/test/browser/Makefile.in b/netwerk/test/browser/Makefile.in index df5e211a8bf..9f6547ece9d 100644 --- a/netwerk/test/browser/Makefile.in +++ b/netwerk/test/browser/Makefile.in @@ -49,4 +49,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/parser/htmlparser/tests/mochitest/Makefile.in b/parser/htmlparser/tests/mochitest/Makefile.in index 7efcaf9cdd2..c686164e3d7 100644 --- a/parser/htmlparser/tests/mochitest/Makefile.in +++ b/parser/htmlparser/tests/mochitest/Makefile.in @@ -103,4 +103,4 @@ _TEST_FILES = parser_datreader.js \ # test_bug534293.html \ libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in index 762cba121ca..c243457449c 100644 --- a/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in +++ b/parser/htmlparser/tests/mochitest/dir_bug534293/Makefile.in @@ -48,4 +48,4 @@ _TEST_FILES = file_bug534293.sjs \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in index 3bf4afd284a..ee26a59fff1 100644 --- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in +++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in @@ -95,4 +95,4 @@ _TEST_FILES = adoption01.dat \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in index ffd87029f3a..140f1171b42 100644 --- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in +++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/Makefile.in @@ -50,4 +50,4 @@ _TEST_FILES = adoption01.dat \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/security/manager/ssl/tests/mochitest/bugs/Makefile.in b/security/manager/ssl/tests/mochitest/bugs/Makefile.in index d478470714f..568ddc03188 100644 --- a/security/manager/ssl/tests/mochitest/bugs/Makefile.in +++ b/security/manager/ssl/tests/mochitest/bugs/Makefile.in @@ -58,6 +58,6 @@ _CHROME_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in index 376ebfc8aa8..6e384d963ef 100644 --- a/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in +++ b/security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in @@ -106,4 +106,4 @@ _TEST_FILES = \ libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in index 07dfa965b1d..11a265d0767 100644 --- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in +++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/Makefile.in @@ -57,4 +57,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index 2a1adbd8a53..2a8eb7dd21a 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -39,6 +39,7 @@ DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ +relativesrcdir = testing/mochitest include $(DEPTH)/config/autoconf.mk @@ -66,12 +67,12 @@ XPI_NAME = mochijar CHROME_JAR = 1 include $(topsrcdir)/config/rules.mk -# We're installing to _mochitest, so this is the depth +# We're installing to _tests/testing/mochitest, so this is the depth # necessary for relative objdir paths. -TARGET_DEPTH = .. +TARGET_DEPTH = ../../.. include $(topsrcdir)/build/automation-build.mk -# files that get copied into $objdir/_mochitest/ +# files that get copied into $objdir/_tests/ _SERV_FILES = \ runtests.py \ automation.py \ @@ -127,7 +128,7 @@ _HANDSHAKE_FILES = \ pywebsocket/mod_pywebsocket/handshake/hybi06.py \ $(NULL) -_DEST_DIR = $(DEPTH)/$(mochitestdir) +_DEST_DIR = $(DEPTH)/_tests/$(relativesrcdir) libs:: (cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -) @@ -198,10 +199,10 @@ PKG_CHROMEJAR = $(PKG_STAGE)/mochitest/content/ ifdef CHROME_JAR stage-chromejar: $(NSINSTALL) -D $(PKG_CHROMEJAR) - cp -RL $(DEPTH)/$(mochitestdir)/browser $(PKG_CHROMEJAR) - cp -RL $(DEPTH)/$(mochitestdir)/chrome $(PKG_CHROMEJAR) + cp -RL $(DEPTH)/_tests/testing/mochitest/browser $(PKG_CHROMEJAR) + cp -RL $(DEPTH)/_tests/testing/mochitest/chrome $(PKG_CHROMEJAR) ifdef ACCESSIBILITY - cp -RL $(DEPTH)/$(mochitestdir)/a11y $(PKG_CHROMEJAR) + cp -RL $(DEPTH)/_tests/testing/mochitest/a11y $(PKG_CHROMEJAR) endif @(cd $(PKG_STAGE)/mochitest && zip -r tests.jar content/) @(rm -rf $(PKG_CHROMEJAR)) @@ -214,7 +215,7 @@ $(_DEST_DIR): stage-package: $(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins - @(cd $(DEPTH)/$(mochitestdir)/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -) + @(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -) @(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -) @(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -) @(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/certs && tar -xf -) diff --git a/testing/mochitest/MochiKit/Makefile.in b/testing/mochitest/MochiKit/Makefile.in index ec0e616520a..1bb55dd3d8b 100644 --- a/testing/mochitest/MochiKit/Makefile.in +++ b/testing/mochitest/MochiKit/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = MochiKit +relativesrcdir = testing/mochitest/MochiKit include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -67,4 +67,4 @@ _JS_FILES = Async.js \ $(NULL) libs:: $(_JS_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in index c149531c88d..e7018f2831f 100644 --- a/testing/mochitest/chrome/Makefile.in +++ b/testing/mochitest/chrome/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = chrome +relativesrcdir = testing/mochitest/chrome include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -53,4 +53,4 @@ _STATIC_FILES = test_sample.xul \ $(NULL) libs:: $(_STATIC_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/dynamic/Makefile.in b/testing/mochitest/dynamic/Makefile.in index e206a09165b..2376fa4e73a 100644 --- a/testing/mochitest/dynamic/Makefile.in +++ b/testing/mochitest/dynamic/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = dynamic +relativesrcdir = testing/mochitest/dynamic include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -49,4 +49,4 @@ _STATIC_FILES = \ $(NULL) libs:: $(_STATIC_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py index a80f76cec37..3fc079128c7 100644 --- a/testing/mochitest/runtests.py +++ b/testing/mochitest/runtests.py @@ -288,7 +288,7 @@ See for details on the logg if not os.path.exists(options.app): msg = """\ Error: Path %(app)s doesn't exist. - Are you executing $objdir/_mochitest/runtests.py?""" + Are you executing $objdir/_tests/testing/mochitest/runtests.py?""" print msg % {"app": options.app} return None diff --git a/testing/mochitest/specialpowers/Makefile.in b/testing/mochitest/specialpowers/Makefile.in index 502f16402ea..7dafbf26619 100644 --- a/testing/mochitest/specialpowers/Makefile.in +++ b/testing/mochitest/specialpowers/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = specialpowers +relativesrcdir = testing/mochitest/specialpowers include $(DEPTH)/config/autoconf.mk @@ -57,7 +57,7 @@ XPI_NAME=specialpowers # Used in install.rdf USE_EXTENSION_MANIFEST=1 -TEST_EXTENSIONS_DIR = $(DEPTH)/${mochitestdir}/extensions +TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions include $(topsrcdir)/config/rules.mk diff --git a/testing/mochitest/static/Makefile.in b/testing/mochitest/static/Makefile.in index 6b75e38f69b..eeecc007b84 100644 --- a/testing/mochitest/static/Makefile.in +++ b/testing/mochitest/static/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = static +relativesrcdir = testing/mochitest/static include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -51,4 +51,4 @@ _STATIC_FILES = test.template.txt \ $(NULL) libs:: $(_STATIC_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in index 42563f6701a..2e110a83e9b 100644 --- a/testing/mochitest/tests/Makefile.in +++ b/testing/mochitest/tests/Makefile.in @@ -40,7 +40,7 @@ DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests +relativesrcdir = testing/mochitest/tests include $(DEPTH)/config/autoconf.mk @@ -71,4 +71,4 @@ endif # Copy the sanity tests into a subdirectory, so the top level is all dirs # in the test screen. libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir)/Harness_sanity + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir)/Harness_sanity diff --git a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in index 68f103bdef7..6cbaca82840 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/MochiKit/Makefile.in @@ -40,7 +40,7 @@ DEPTH = ../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests/MochiKit-1.4.2/MochiKit +relativesrcdir = testing/mochitest/tests/MochiKit-1.4.2/MochiKit include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -68,4 +68,4 @@ _MOCHIKIT_FILES = \ $(NULL) libs:: $(_MOCHIKIT_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in index 3692792b7fd..159b26887b3 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/Makefile.in @@ -40,7 +40,7 @@ DEPTH = ../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests/MochiKit-1.4.2/tests +relativesrcdir = testing/mochitest/tests/MochiKit-1.4.2/tests include $(DEPTH)/config/autoconf.mk @@ -82,4 +82,4 @@ _TEST_FILES = \ # test_MochiKit-JSAN.html \ libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in index 6131ae9909e..f02c694a6d3 100644 --- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in +++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in @@ -44,7 +44,7 @@ DEPTH = ../../../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests/MochiKit-1.4.2/tests/SimpleTest +relativesrcdir = testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -54,4 +54,4 @@ _STUBS_FILES = \ $(NULL) libs:: $(_STUBS_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in index 19d50535c57..87502e97b66 100644 --- a/testing/mochitest/tests/SimpleTest/Makefile.in +++ b/testing/mochitest/tests/SimpleTest/Makefile.in @@ -38,7 +38,7 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests/SimpleTest +relativesrcdir = testing/mochitest/tests/SimpleTest include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -58,5 +58,5 @@ _SIMPLETEST_FILES = MozillaLogger.js \ $(NULL) libs:: $(_SIMPLETEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/$(relativesrcdir) diff --git a/testing/mochitest/tests/browser/Makefile.in b/testing/mochitest/tests/browser/Makefile.in index 2184c324c73..a5a22df2798 100644 --- a/testing/mochitest/tests/browser/Makefile.in +++ b/testing/mochitest/tests/browser/Makefile.in @@ -39,7 +39,7 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -relativesrcdir = tests/browser +relativesrcdir = testing/mochitest/tests/browser include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk @@ -68,4 +68,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 656cc33006d..e51169333ff 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -57,13 +57,13 @@ mochitest:: $(MOCHITESTS) RUN_MOCHITEST = \ rm -f ./$@.log && \ - $(PYTHON) $(mochitestdir)/runtests.py --autorun --close-when-done \ + $(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done \ --console-level=INFO --log-file=./$@.log --file-level=INFO \ $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) RUN_MOCHITEST_REMOTE = \ rm -f ./$@.log && \ - $(PYTHON) $(mochitestdir)/runtestsremote.py --autorun --close-when-done \ + $(PYTHON) _tests/testing/mochitest/runtestsremote.py --autorun --close-when-done \ --console-level=INFO --log-file=./$@.log --file-level=INFO $(DM_FLAGS) --dm_trans=$(DM_TRANS) \ --app=$(ANDROID_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \ $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) diff --git a/toolkit/components/aboutmemory/tests/chrome/Makefile.in b/toolkit/components/aboutmemory/tests/chrome/Makefile.in index 79141e1667d..beec9f7b71d 100644 --- a/toolkit/components/aboutmemory/tests/chrome/Makefile.in +++ b/toolkit/components/aboutmemory/tests/chrome/Makefile.in @@ -50,5 +50,5 @@ _CHROME_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/components/alerts/test/Makefile.in b/toolkit/components/alerts/test/Makefile.in index 80168907dbe..8cc1c369afe 100644 --- a/toolkit/components/alerts/test/Makefile.in +++ b/toolkit/components/alerts/test/Makefile.in @@ -55,4 +55,4 @@ MOCHI_TESTS = \ include $(topsrcdir)/config/rules.mk libs:: $(MOCHI_TESTS) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/ctypes/tests/Makefile.in b/toolkit/components/ctypes/tests/Makefile.in index e28cc2feb11..1d4b584a00e 100644 --- a/toolkit/components/ctypes/tests/Makefile.in +++ b/toolkit/components/ctypes/tests/Makefile.in @@ -75,7 +75,7 @@ include $(topsrcdir)/config/rules.mk xpctestdir = $(testxpcobjdir)/$(relativesrcdir)/unit chrometestdir = \ - $(DEPTH)/$(mochitestdir)/chrome/toolkit/components/$(relativesrcdir) + $(DEPTH)/_tests/testing/mochitest/chrome/toolkit/components/$(relativesrcdir) # preprocess and install our unit test into the appropriate directory, # and install the test library as well. the xpcshell test rules will @@ -84,7 +84,7 @@ libs:: unit/test_jsctypes.js.in $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ $^ > $(xpctestdir)/test_jsctypes.js $(INSTALL) $(SHARED_LIBRARY) $(xpctestdir) - $(INSTALL) $(SHARED_LIBRARY) $(DEPTH)/$(mochitestdir)/chrome/libraries + $(INSTALL) $(SHARED_LIBRARY) $(DEPTH)/_tests/testing/mochitest/chrome/libraries $(INSTALL) $(xpctestdir)/test_jsctypes.js $(chrometestdir) $(INSTALL) $(xpctestdir)/$(SHARED_LIBRARY) $(chrometestdir) $(RM) $(xpctestdir)/test_jsctypes.js.in diff --git a/toolkit/components/downloads/test/browser/Makefile.in b/toolkit/components/downloads/test/browser/Makefile.in index 7499e1d00e6..a894b3a8006 100644 --- a/toolkit/components/downloads/test/browser/Makefile.in +++ b/toolkit/components/downloads/test/browser/Makefile.in @@ -50,4 +50,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/components/feeds/test/Makefile.in b/toolkit/components/feeds/test/Makefile.in index 64239ae39b4..7d9490b4bdd 100644 --- a/toolkit/components/feeds/test/Makefile.in +++ b/toolkit/components/feeds/test/Makefile.in @@ -49,4 +49,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/components/microformats/tests/Makefile.in b/toolkit/components/microformats/tests/Makefile.in index 36aa023f5f6..9e1732237f8 100644 --- a/toolkit/components/microformats/tests/Makefile.in +++ b/toolkit/components/microformats/tests/Makefile.in @@ -58,4 +58,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/toolkit/components/microformats/tests + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/toolkit/components/microformats/tests diff --git a/toolkit/components/passwordmgr/test/Makefile.in b/toolkit/components/passwordmgr/test/Makefile.in index 2bd124ce1bf..f8fe444e87e 100644 --- a/toolkit/components/passwordmgr/test/Makefile.in +++ b/toolkit/components/passwordmgr/test/Makefile.in @@ -133,4 +133,4 @@ endif include $(topsrcdir)/config/rules.mk libs:: $(MOCHI_TESTS) $(MOCHI_CONTENT) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/passwordmgr/test/browser/Makefile.in b/toolkit/components/passwordmgr/test/browser/Makefile.in index 9eb88cdb193..9e6ae9f5c51 100644 --- a/toolkit/components/passwordmgr/test/browser/Makefile.in +++ b/toolkit/components/passwordmgr/test/browser/Makefile.in @@ -52,4 +52,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in index cee74dce9ea..e72fb6891d6 100644 --- a/toolkit/components/perf/Makefile.in +++ b/toolkit/components/perf/Makefile.in @@ -65,7 +65,7 @@ _CHROME_TEST_FILES = \ $(NULL) chrometestdir = \ - $(DEPTH)/$(mochitestdir)/chrome/toolkit/components/$(MODULE) + $(DEPTH)/_tests/testing/mochitest/chrome/toolkit/components/$(MODULE) endif include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/tests/Makefile.in b/toolkit/components/places/tests/Makefile.in index baf5e93cb27..ee0f8a309c7 100644 --- a/toolkit/components/places/tests/Makefile.in +++ b/toolkit/components/places/tests/Makefile.in @@ -84,7 +84,7 @@ TOOL_DIRS = \ include $(topsrcdir)/config/rules.mk libs:: $(MOCHI_TESTS) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(XPCSHELL_TESTS_COMMON) $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/xpcshell/$(relativesrcdir) diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in index a25fe597228..81c896bcc9a 100644 --- a/toolkit/components/places/tests/browser/Makefile.in +++ b/toolkit/components/places/tests/browser/Makefile.in @@ -73,7 +73,7 @@ _HTTP_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/places/tests/chrome/Makefile.in b/toolkit/components/places/tests/chrome/Makefile.in index ab7ac30c217..66fea3547be 100644 --- a/toolkit/components/places/tests/chrome/Makefile.in +++ b/toolkit/components/places/tests/chrome/Makefile.in @@ -64,8 +64,8 @@ _CHROME_FILES = \ $(NULL) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in index 7a3f09f9e26..463faf9c161 100644 --- a/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in +++ b/toolkit/components/places/tests/mochitest/bug_411966/Makefile.in @@ -56,4 +56,4 @@ _HTTP_FILES = \ $(NULL) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in index 71d71962ba5..b459e1018c4 100644 --- a/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in +++ b/toolkit/components/places/tests/mochitest/bug_461710/Makefile.in @@ -53,4 +53,4 @@ _HTTP_FILES = \ $(NULL) libs:: $(_HTTP_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/prompts/test/Makefile.in b/toolkit/components/prompts/test/Makefile.in index e8f4fc9ba73..de080233693 100644 --- a/toolkit/components/prompts/test/Makefile.in +++ b/toolkit/components/prompts/test/Makefile.in @@ -64,4 +64,4 @@ MOCHI_CONTENT = \ include $(topsrcdir)/config/rules.mk libs:: $(MOCHI_TESTS) $(MOCHI_CONTENT) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/satchel/test/Makefile.in b/toolkit/components/satchel/test/Makefile.in index 41e78db6ca0..1349249b43d 100644 --- a/toolkit/components/satchel/test/Makefile.in +++ b/toolkit/components/satchel/test/Makefile.in @@ -69,5 +69,5 @@ MOCHI_CONTENT = \ include $(topsrcdir)/config/rules.mk libs:: $(MOCHI_TESTS) $(MOCHI_CONTENT) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/browser/Makefile.in index 00940dc82aa..9be8cf5ffcc 100644 --- a/toolkit/components/startup/tests/browser/Makefile.in +++ b/toolkit/components/startup/tests/browser/Makefile.in @@ -51,4 +51,4 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/components/url-classifier/tests/mochitest/Makefile.in b/toolkit/components/url-classifier/tests/mochitest/Makefile.in index e0d19bb3cd4..6aa51bab102 100644 --- a/toolkit/components/url-classifier/tests/mochitest/Makefile.in +++ b/toolkit/components/url-classifier/tests/mochitest/Makefile.in @@ -58,4 +58,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/components/viewsource/test/Makefile.in b/toolkit/components/viewsource/test/Makefile.in index 51c5baa8167..2cf06728ac5 100644 --- a/toolkit/components/viewsource/test/Makefile.in +++ b/toolkit/components/viewsource/test/Makefile.in @@ -50,4 +50,4 @@ _CHROME_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/content/tests/browser/Makefile.in b/toolkit/content/tests/browser/Makefile.in index 75b2235307e..37c978860d6 100644 --- a/toolkit/content/tests/browser/Makefile.in +++ b/toolkit/content/tests/browser/Makefile.in @@ -60,4 +60,4 @@ _BROWSER_TEST_FILES = \ $(NULL) libs:: $(_BROWSER_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in index b58b3ceb3fe..9d8e2f9be1a 100644 --- a/toolkit/content/tests/browser/common/Makefile.in +++ b/toolkit/content/tests/browser/common/Makefile.in @@ -50,4 +50,4 @@ _COMMON_FILES = \ $(NULL) libs:: $(_COMMON_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/content/tests/browser/data/Makefile.in b/toolkit/content/tests/browser/data/Makefile.in index 576bb2b3cca..03b75cc2449 100644 --- a/toolkit/content/tests/browser/data/Makefile.in +++ b/toolkit/content/tests/browser/data/Makefile.in @@ -50,4 +50,4 @@ _DATA_FILES = \ $(NULL) libs:: $(_DATA_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/content/tests/chrome/Makefile.in b/toolkit/content/tests/chrome/Makefile.in index bc46d59f1ad..9220e32b07e 100644 --- a/toolkit/content/tests/chrome/Makefile.in +++ b/toolkit/content/tests/chrome/Makefile.in @@ -203,4 +203,4 @@ _TEST_FILES += $(warning test_cursorsnap.xul temporarily disabled) \ endif libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/content/tests/chrome/rtlchrome/Makefile.in b/toolkit/content/tests/chrome/rtlchrome/Makefile.in index 103fbdcc312..4fabaa851e4 100644 --- a/toolkit/content/tests/chrome/rtlchrome/Makefile.in +++ b/toolkit/content/tests/chrome/rtlchrome/Makefile.in @@ -45,6 +45,6 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk libs:: rtl.manifest rtl.css rtl.dtd - $(INSTALL) @srcdir@/rtl.manifest $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/ - $(INSTALL) @srcdir@/rtl.css $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/ - $(INSTALL) @srcdir@/rtl.dtd $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/ + $(INSTALL) @srcdir@/rtl.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/ + $(INSTALL) @srcdir@/rtl.css $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/ + $(INSTALL) @srcdir@/rtl.dtd $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/ diff --git a/toolkit/content/tests/chrome/rtltest/Makefile.in b/toolkit/content/tests/chrome/rtltest/Makefile.in index 56d585ef314..6bfec3fc203 100644 --- a/toolkit/content/tests/chrome/rtltest/Makefile.in +++ b/toolkit/content/tests/chrome/rtltest/Makefile.in @@ -45,5 +45,5 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk libs:: righttoleft.manifest dirtest.xul - $(INSTALL) @srcdir@/righttoleft.manifest $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/ - $(INSTALL) @srcdir@/dirtest.xul $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/content/ + $(INSTALL) @srcdir@/righttoleft.manifest $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/ + $(INSTALL) @srcdir@/dirtest.xul $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/content/ diff --git a/toolkit/content/tests/widgets/Makefile.in b/toolkit/content/tests/widgets/Makefile.in index 8356a7514a8..9bf02061b49 100644 --- a/toolkit/content/tests/widgets/Makefile.in +++ b/toolkit/content/tests/widgets/Makefile.in @@ -87,11 +87,11 @@ _TEST_FILES += test_menubar.xul \ endif libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/../chrome + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/../chrome libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) libs:: $(_CHROME_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/crashreporter/test/Makefile.in b/toolkit/crashreporter/test/Makefile.in index c2b9b5c5eac..12553cd3b32 100644 --- a/toolkit/crashreporter/test/Makefile.in +++ b/toolkit/crashreporter/test/Makefile.in @@ -90,7 +90,7 @@ _BROWSER_FILES = \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir)/browser + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/browser endif libs:: $(SHARED_LIBRARY) $(EXTRA_JS_MODULES) diff --git a/toolkit/mozapps/downloads/tests/chrome/Makefile.in b/toolkit/mozapps/downloads/tests/chrome/Makefile.in index 805d85ba09e..35114077bac 100644 --- a/toolkit/mozapps/downloads/tests/chrome/Makefile.in +++ b/toolkit/mozapps/downloads/tests/chrome/Makefile.in @@ -91,4 +91,4 @@ _CHROME_FILES += \ endif libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/mozapps/extensions/test/browser/Makefile.in b/toolkit/mozapps/extensions/test/browser/Makefile.in index 08ebca28aed..fc052ac7796 100644 --- a/toolkit/mozapps/extensions/test/browser/Makefile.in +++ b/toolkit/mozapps/extensions/test/browser/Makefile.in @@ -41,7 +41,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = toolkit/mozapps/extensions/test/browser ADDONSRC = $(srcdir)/addons -TESTXPI = $(CURDIR)/$(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir)/addons +TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons include $(DEPTH)/config/autoconf.mk @@ -133,14 +133,14 @@ _TEST_RESOURCES = \ include $(topsrcdir)/config/rules.mk libs:: $(_MAIN_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir)-window + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)-window libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: $(_TEST_RESOURCES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) libs:: rm -rf $(TESTXPI) diff --git a/toolkit/mozapps/extensions/test/mochitest/Makefile.in b/toolkit/mozapps/extensions/test/mochitest/Makefile.in index 293df06d98b..3476b63e988 100644 --- a/toolkit/mozapps/extensions/test/mochitest/Makefile.in +++ b/toolkit/mozapps/extensions/test/mochitest/Makefile.in @@ -48,4 +48,4 @@ _TEST_FILES = test_bug609794.html \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in index 47a739dbd16..0e6c622bbbf 100644 --- a/toolkit/mozapps/extensions/test/xpinstall/Makefile.in +++ b/toolkit/mozapps/extensions/test/xpinstall/Makefile.in @@ -130,4 +130,4 @@ _BROWSER_FILES = head.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) diff --git a/toolkit/mozapps/plugins/tests/Makefile.in b/toolkit/mozapps/plugins/tests/Makefile.in index 534a0d114d2..9c333f24869 100644 --- a/toolkit/mozapps/plugins/tests/Makefile.in +++ b/toolkit/mozapps/plugins/tests/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = test_plugins relativesrcdir = toolkit/mozapps/plugins/tests -TESTROOT = $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) +TESTROOT = $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) USE_STATIC_LIBS = 1 ifneq (mobile,$(MOZ_BUILD_APP)) diff --git a/toolkit/mozapps/shared/test/chrome/Makefile.in b/toolkit/mozapps/shared/test/chrome/Makefile.in index 1b83869cf15..634ec7eba98 100644 --- a/toolkit/mozapps/shared/test/chrome/Makefile.in +++ b/toolkit/mozapps/shared/test/chrome/Makefile.in @@ -50,4 +50,4 @@ _CHROME_FILES = \ include $(topsrcdir)/config/rules.mk libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/toolkit/mozapps/update/test/chrome/Makefile.in b/toolkit/mozapps/update/test/chrome/Makefile.in index 68af4e6b4be..eb6beb46266 100644 --- a/toolkit/mozapps/update/test/chrome/Makefile.in +++ b/toolkit/mozapps/update/test/chrome/Makefile.in @@ -109,13 +109,13 @@ _CHROME_FILES = \ include $(topsrcdir)/config/rules.mk libs:: $(_OTHER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) libs:: $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/utils.js > \ - $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/utils.js + $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/utils.js $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $(srcdir)/update.sjs > \ - $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir)/update.sjs + $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)/update.sjs diff --git a/toolkit/profile/test/Makefile.in b/toolkit/profile/test/Makefile.in index be3aa9a5355..f3509a41c5c 100644 --- a/toolkit/profile/test/Makefile.in +++ b/toolkit/profile/test/Makefile.in @@ -49,6 +49,6 @@ _CHROME_FILES = \ $(NULL) libs:: $(_CHROME_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) include $(topsrcdir)/config/rules.mk diff --git a/toolkit/themes/pinstripe/mochitests/Makefile.in b/toolkit/themes/pinstripe/mochitests/Makefile.in index b06ea3ad380..911e69e3c45 100644 --- a/toolkit/themes/pinstripe/mochitests/Makefile.in +++ b/toolkit/themes/pinstripe/mochitests/Makefile.in @@ -48,4 +48,4 @@ _TEST_FILES = test_bug510426.xul \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/toolkit/xre/test/Makefile.in b/toolkit/xre/test/Makefile.in index 19e455eb2a4..48f278af67e 100644 --- a/toolkit/xre/test/Makefile.in +++ b/toolkit/xre/test/Makefile.in @@ -55,4 +55,4 @@ MOCHITEST_FILES = \ include $(topsrcdir)/config/rules.mk libs:: $(MOCHITEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/uriloader/exthandler/tests/mochitest/Makefile.in b/uriloader/exthandler/tests/mochitest/Makefile.in index 4795f86f867..f96f33383e4 100644 --- a/uriloader/exthandler/tests/mochitest/Makefile.in +++ b/uriloader/exthandler/tests/mochitest/Makefile.in @@ -53,4 +53,4 @@ _TEST_FILES = \ $(NULL) libs:: $(_TEST_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in index e9a7bc21225..c6eb8563e14 100644 --- a/widget/tests/Makefile.in +++ b/widget/tests/Makefile.in @@ -135,8 +135,8 @@ endif ifdef _TEST_FILES libs:: $(_TEST_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/tests/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir) endif libs:: $(_CHROME_FILES) - $(INSTALL) $^ $(DEPTH)/$(mochitestdir)/chrome/$(relativesrcdir) + $(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir) diff --git a/xpinstall/tests/Makefile.in b/xpinstall/tests/Makefile.in index 614acf64f37..3412f19ee3a 100644 --- a/xpinstall/tests/Makefile.in +++ b/xpinstall/tests/Makefile.in @@ -104,5 +104,5 @@ _BROWSER_FILES = harness.js \ $(NULL) libs:: $(_BROWSER_FILES) - $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/$(mochitestdir)/browser/$(relativesrcdir) + $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir) endif