Bug 1014691 - Move TestAsyncPanZoomController.cpp to gfx/layers/apz/test/gtest. r=kats,glandium
authorBotond Ballo <botond@mozilla.com>
Fri, 18 Sep 2015 13:19:05 -0400
changeset 263614 5807b0c3f345dce5b9a5df55d95597606ae4bcb0
parent 263613 a88317c76f6496ab37fe9edd2b7588b2e01aeadc
child 263615 82e3928eea38fe896e73f351e061ded533c5d56a
push id65371
push userbballo@mozilla.com
push dateMon, 21 Sep 2015 23:15:26 +0000
treeherdermozilla-inbound@ffbfef1d206e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats, glandium
bugs1014691
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1014691 - Move TestAsyncPanZoomController.cpp to gfx/layers/apz/test/gtest. r=kats,glandium
gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
gfx/layers/apz/test/gtest/moz.build
gfx/layers/moz.build
gfx/moz.build
gfx/tests/gtest/TestAsyncPanZoomController.cpp
gfx/tests/gtest/moz.build
rename from gfx/tests/gtest/TestAsyncPanZoomController.cpp
rename to gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
new file mode 100644
--- /dev/null
+++ b/gfx/layers/apz/test/gtest/moz.build
@@ -0,0 +1,21 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+UNIFIED_SOURCES += [
+    'TestAsyncPanZoomController.cpp',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/gfx/2d',
+    '/gfx/layers',
+    '/gfx/tests/gtest'  # for TestLayers.h, which is shared with the gfx gtests
+]
+
+FINAL_LIBRARY = 'xul-gtest'
+
+CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -401,15 +401,18 @@ CXXFLAGS += [
     '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
         'frameworks/base/include/media/stagefright',
         'frameworks/base/include/media/stagefright/openmax',
         'frameworks/av/include/media/stagefright',
         'frameworks/native/include/media/openmax',
     ]
 ]
 
+if CONFIG['ENABLE_TESTS']:
+    DIRS += ['apz/test/gtest']
+
 MOCHITEST_MANIFESTS += ['apz/test/mochitest/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['apz/test/mochitest/chrome.ini']
 
 CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
 
 LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
--- a/gfx/moz.build
+++ b/gfx/moz.build
@@ -1,17 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-with Files('tests/gtest/TestAsyncPanZoomController.cpp'):
-    BUG_COMPONENT = ('Core', 'Panning and Zooming')
-
 if CONFIG['MOZ_TREE_CAIRO']:
     DIRS += ['cairo']
 
 DIRS += [
     '2d',
     'ycbcr',
     'angle',
     'src',
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -3,17 +3,16 @@
 # 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/.
 
 UNIFIED_SOURCES += [
     'gfxSurfaceRefCountTest.cpp',
     # Disabled on suspicion of causing bug 904227
     #'gfxWordCacheTest.cpp',
-    'TestAsyncPanZoomController.cpp',
     'TestBufferRotation.cpp',
     'TestColorNames.cpp',
     'TestCompositor.cpp',
     'TestGfxPrefs.cpp',
     'TestGfxWidgets.cpp',
     'TestLayers.cpp',
     'TestMoz2D.cpp',
     'TestQcms.cpp',