Issue #1676 - Part 1: Split MozTesting directives out of js/src/moz.build

2 files changed, 49 insertions, 45 deletions

diff --git a/js/src/js-testing.mozbuild b/js/src/js-testing.mozbuild
new file mode 100644
index 000000000..a880d9831
--- /dev/null
+++ b/js/src/js-testing.mozbuild
@@ -0,0 +1,48 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+component_engine = ('Core', 'JavaScript Engine')
+component_gc     = ('Core', 'JavaScript: GC')
+component_intl   = ('Core', 'JavaScript: Internationalization API')
+component_jit    = ('Core', 'JavaScript Engine: JIT')
+component_stl    = ('Core', 'JavaScript: Standard Library')
+
+with Files('../public/**'):
+    BUG_COMPONENT = component_engine
+with Files('*'):
+    BUG_COMPONENT = component_engine
+
+with Files('wasm/**'):
+    BUG_COMPONENT = component_jit
+with Files('builtin/**'):
+    BUG_COMPONENT = component_stl
+with Files('ctypes/**'):
+    BUG_COMPONENT = ('Core', 'js-ctypes')
+with Files('gc/**'):
+    BUG_COMPONENT = component_gc
+with Files('jit/**'):
+    BUG_COMPONENT = component_jit
+
+# File-specific metadata
+for gcfile in ['jsgc*', 'devtools/rootAnalysis', 'devtools/gc-ubench', 'devtools/gctrace']:
+    with Files(gcfile):
+        BUG_COMPONENT = component_gc
+for header in ('GCAnnotations.h', 'GCAPI.h', 'HeapAPI.h', 'RootingAPI.h', 'SliceBudget.h', 'SweepingAPI.h', 'TraceKind.h', 'TracingAPI.h', 'WeakMapPtr.h'):
+    with Files('../public/' + header):
+        BUG_COMPONENT = component_gc
+
+for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*', 'json.*', 'jsstr.*']:
+    with Files(stlfile):
+        BUG_COMPONENT = component_stl
+
+with Files('builtin/Intl*'):
+    BUG_COMPONENT = component_intl
+with Files('builtin/make_intl_data.py'):
+    BUG_COMPONENT = component_intl
+
+with Files('../public/TrackedOptimizationInfo.h'):
+    BUG_COMPONENT = component_jit
+
+TEST_DIRS += ['jsapi-tests', 'tests', 'gdb']
\ No newline at end of file
diff --git a/js/src/moz.build b/js/src/moz.build
index 46a44603e..c8988fafc 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -3,60 +3,16 @@
 # 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/.
 
-# Directory metadata
-component_engine = ('Core', 'JavaScript Engine')
-component_gc     = ('Core', 'JavaScript: GC')
-component_intl   = ('Core', 'JavaScript: Internationalization API')
-component_jit    = ('Core', 'JavaScript Engine: JIT')
-component_stl    = ('Core', 'JavaScript: Standard Library')
+include('js-testing.mozbuild')
 
 FILES_PER_UNIFIED_FILE = 6
 
-with Files('../public/**'):
-    BUG_COMPONENT = component_engine
-with Files('*'):
-    BUG_COMPONENT = component_engine
-
-with Files('wasm/**'):
-    BUG_COMPONENT = component_jit
-with Files('builtin/**'):
-    BUG_COMPONENT = component_stl
-with Files('ctypes/**'):
-    BUG_COMPONENT = ('Core', 'js-ctypes')
-with Files('gc/**'):
-    BUG_COMPONENT = component_gc
-with Files('jit/**'):
-    BUG_COMPONENT = component_jit
-
-# File-specific metadata
-for gcfile in ['jsgc*', 'devtools/rootAnalysis', 'devtools/gc-ubench', 'devtools/gctrace']:
-    with Files(gcfile):
-        BUG_COMPONENT = component_gc
-for header in ('GCAnnotations.h', 'GCAPI.h', 'HeapAPI.h', 'RootingAPI.h', 'SliceBudget.h', 'SweepingAPI.h', 'TraceKind.h', 'TracingAPI.h', 'WeakMapPtr.h'):
-    with Files('../public/' + header):
-        BUG_COMPONENT = component_gc
-
-for stlfile in ['jsarray.*', 'jsbool*', 'jsdate.*', 'jsnum.*', 'json.*', 'jsstr.*']:
-    with Files(stlfile):
-        BUG_COMPONENT = component_stl
-
-with Files('builtin/Intl*'):
-    BUG_COMPONENT = component_intl
-with Files('builtin/make_intl_data.py'):
-    BUG_COMPONENT = component_intl
-
-with Files('../public/TrackedOptimizationInfo.h'):
-    BUG_COMPONENT = component_jit
-
-
 if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
-TEST_DIRS += ['jsapi-tests', 'tests', 'gdb']
-
 CONFIGURE_SUBST_FILES += [
     'devtools/rootAnalysis/Makefile',
     'js-config',