Bug 885019 - Move GTEST_CPPSRCS, GTEST_CMMSRCS, and GTEST_CSRCS to moz.build as GTEST_CPP_SOURCES, GTEST_CMM_SOURCES, and GTEST_C_SOURCES. r=gps

config/rules.mk

@@ -17,6 +17,9 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
   EXTRA_PP_COMPONENTS \
+  GTEST_CMMSRCS \
+  GTEST_CPPSRCS \
+  GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \

gfx/tests/gtest/Makefile.in

@@ -23,23 +23,6 @@ LOCAL_INCLUDES = \
   -I$(topsrcdir)/gfx/2d/unittest \
   $(NULL)
 
-GTEST_CPPSRCS = \
-  TestLayers.cpp \
-  TestTiledLayerBuffer.cpp \
-  TestAsyncPanZoomController.cpp \
-  $(NULL)
-
-# Because of gkmedia on windows we wont find these
-# symbols in xul.dll.
-ifneq ($(MOZ_WIDGET_TOOLKIT),windows)
-GTEST_CPPSRCS += \
-  TestMoz2D.cpp \
-  TestBase.cpp \
-  TestPoint.cpp \
-  TestScaling.cpp \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

gfx/tests/gtest/moz.build

@@ -8,3 +8,18 @@ MODULE = 'gfxtest'
 
 LIBRARY_NAME = 'gfxtest'
 
+GTEST_CPP_SOURCES += [
+    'TestAsyncPanZoomController.cpp',
+    'TestLayers.cpp',
+    'TestTiledLayerBuffer.cpp',
+]
+
+# Because of gkmedia on windows we wont find these
+# symbols in xul.dll.
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
+    GTEST_CPP_SOURCES += [
+        'TestBase.cpp'
+        'TestMoz2D.cpp'
+        'TestPoint.cpp'
+        'TestScaling.cpp'
+    ]

js/src/config/rules.mk

@@ -17,6 +17,9 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
   EXTRA_PP_COMPONENTS \
+  GTEST_CMMSRCS \
+  GTEST_CPPSRCS \
+  GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   MODULE \

python/mozbuild/mozbuild/frontend/emitter.py

@@ -87,6 +87,9 @@ class TreeMetadataEmitter(object):
             EXTRA_COMPONENTS='EXTRA_COMPONENTS',
             EXTRA_JS_MODULES='EXTRA_JS_MODULES',
             EXTRA_PP_COMPONENTS='EXTRA_PP_COMPONENTS',
+            GTEST_CMMSRCS='GTEST_CMM_SOURCES',
+            GTEST_CPPSRCS='GTEST_CPP_SOURCES',
+            GTEST_CSRCS='GTEST_C_SOURCES',
             HOST_CSRCS='HOST_CSRCS',
             HOST_LIBRARY_NAME='HOST_LIBRARY_NAME',
             JS_MODULES_PATH='JS_MODULES_PATH',

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -118,6 +118,27 @@ VARIABLES = {
        files will be installed in the /components directory of the distribution.
         """),
 
+    'GTEST_C_SOURCES': (StrictOrderingOnAppendList, list, [],
+        """C code source files for GTest unit tests.
+
+        This variable contains a list of C GTEST unit test source files to
+        compile.
+        """),
+
+    'GTEST_CMM_SOURCES': (StrictOrderingOnAppendList, list, [],
+        """Sources for GTest unit tests to compile with the Objective C/C++ compiler.
+
+        This variable contains a list of objective-C++ GTest unit test sources
+        to compile.
+        """),
+
+    'GTEST_CPP_SOURCES': (list, list, [],
+        """C++ source files for GTest unit tests.
+
+        This is a list of C++ GTest unit test sources. Entries must be files
+        that exist. These generally have .cpp, .cc, or .cxx extensions.
+        """),
+
     'HOST_CSRCS': (StrictOrderingOnAppendList, list, [],
         """C source files to compile with the host compiler.
 

python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build

@@ -13,6 +13,10 @@ DEFINES = ['-Dbar', '-Dfoo']
 EXTRA_COMPONENTS = ['bar.js', 'foo.js']
 EXTRA_PP_COMPONENTS = ['bar.pp.js', 'foo.pp.js']
 
+GTEST_C_SOURCES = ['test1.c', 'test2.c']
+GTEST_CMM_SOURCES = ['test1.mm', 'test2.mm']
+GTEST_CPP_SOURCES = ['test1.cpp', 'test2.cpp']
+
 HOST_CSRCS = ['bar.c', 'foo.c']
 
 HOST_LIBRARY_NAME = 'host_bar'

python/mozbuild/mozbuild/test/backend/test_recursivemake.py

@@ -162,6 +162,18 @@ class TestRecursiveMakeBackend(BackendTester):
                 'EXTRA_PP_COMPONENTS += bar.pp.js',
                 'EXTRA_PP_COMPONENTS += foo.pp.js',
             ],
+            'GTEST_CMMSRCS': [
+                'GTEST_CMMSRCS += test1.mm',
+                'GTEST_CMMSRCS += test2.mm',
+            ],
+            'GTEST_CPPSRCS': [
+                'GTEST_CPPSRCS += test1.cpp',
+                'GTEST_CPPSRCS += test2.cpp',
+            ],
+            'GTEST_CSRCS': [
+                'GTEST_CSRCS += test1.c',
+                'GTEST_CSRCS += test2.c',
+            ],
             'HOST_CSRCS': [
                 'HOST_CSRCS += bar.c',
                 'HOST_CSRCS += foo.c',

python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build

@@ -13,6 +13,10 @@ DEFINES=['-Dfans', '-Dtans']
 EXTRA_COMPONENTS=['fans.js', 'tans.js']
 EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js']
 
+GTEST_C_SOURCES = ['test1.c', 'test2.c']
+GTEST_CMM_SOURCES = ['test1.mm', 'test2.mm']
+GTEST_CPP_SOURCES = ['test1.cpp', 'test2.cpp']
+
 HOST_CSRCS += ['fans.c', 'tans.c']
 
 HOST_LIBRARY_NAME = 'host_fans'

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -131,6 +131,9 @@ class TestEmitterBasic(unittest.TestCase):
             DEFINES=['-Dfans', '-Dtans'],
             EXTRA_COMPONENTS=['fans.js', 'tans.js'],
             EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js'],
+            GTEST_CSRCS=['test1.c', 'test2.c'],
+            GTEST_CMMSRCS=['test1.mm', 'test2.mm'],
+            GTEST_CPPSRCS=['test1.cpp', 'test2.cpp'],
             HOST_CSRCS=['fans.c', 'tans.c'],
             HOST_LIBRARY_NAME='host_fans',
             LIBRARY_NAME='lib_name',

testing/gtest/Makefile.in

@@ -22,10 +22,6 @@ EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT = 1
 
-GTEST_CPPSRCS = \
-  SanityTest.cpp \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/gtest \
   -I$(srcdir)/gtest/include \

testing/gtest/moz.build

@@ -61,3 +61,7 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gtest'
 
+GTEST_CPP_SOURCES += [
+    'SanityTest.cpp',
+]
+