Bug 1906047 - Move toolkit/profile/ tests into a test sub-directory. r=mossop

Differential Revision: https://phabricator.services.mozilla.com/D215736

.eslintrc-rollouts.js

@@ -402,7 +402,7 @@ const rollouts = [
       "toolkit/mozapps/extensions/**",
       "toolkit/mozapps/handling/**",
       "toolkit/mozapps/update/**",
-      "toolkit/profile/test/test_create_profile.xhtml",
+      "toolkit/profile/test/chrome/test_create_profile.xhtml",
       "tools/code-coverage/tests/mochitest/test_coverage_specialpowers.html",
       "tools/lint/eslint/**",
       "tools/profiler/tests/**",
@@ -569,8 +569,8 @@ const rollouts = [
       "toolkit/mozapps/handling/**",
       "toolkit/mozapps/update/**",
       "toolkit/profile/content/profileSelection.js",
-      "toolkit/profile/xpcshell/head.js",
-      "toolkit/profile/test/test_create_profile.xhtml",
+      "toolkit/profile/test/xpcshell/head.js",
+      "toolkit/profile/test/chrome/test_create_profile.xhtml",
       "toolkit/themes/shared/design-system/tokens-config.js",
       "tools/code-coverage/tests/mochitest/test_coverage_specialpowers.html",
       "tools/lint/eslint/**",

.eslintrc-test-paths.js

@@ -66,7 +66,6 @@ const extraXpcshellTestPaths = [
   "toolkit/components/thumbnails/test/",
   "toolkit/modules/tests/modules/",
   "toolkit/mozapps/update/tests/data/",
-  "toolkit/profile/xpcshell/",
   "toolkit/xre/test/",
   "widget/headless/tests/",
 ];
@@ -266,7 +265,6 @@ const extraChromeTestPaths = [
   "toolkit/components/windowwatcher/test/",
   "toolkit/components/workerloader/tests/",
   "toolkit/content/tests/widgets/",
-  "toolkit/profile/test/",
   "widget/tests/",
   "xpfe/appshell/test/",
 ];

toolkit/profile/moz.build

@@ -4,12 +4,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOCHITEST_CHROME_MANIFESTS += ["test/chrome.toml"]
+MOCHITEST_CHROME_MANIFESTS += ["test/chrome/chrome.toml"]
 
-XPCSHELL_TESTS_MANIFESTS += ["xpcshell/xpcshell.toml"]
+XPCSHELL_TESTS_MANIFESTS += ["test/xpcshell/xpcshell.toml"]
 
 if CONFIG["ENABLE_TESTS"]:
-    DIRS += ["gtest"]
+    DIRS += ["test/gtest"]
 
 XPIDL_SOURCES += [
     "nsIProfileMigrator.idl",

toolkit/profile/test/gtest/moz.build

@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LOCAL_INCLUDES += [
-    "..",
+    "../..",
 ]
 
 UNIFIED_SOURCES += [