Skip to content

Commit

Permalink
Bug 1014691 - Move TestAsyncPanZoomController.cpp to gfx/layers/apz/t…
Browse files Browse the repository at this point in the history
…est/gtest. r=kats,glandium

--HG--
rename : gfx/tests/gtest/TestAsyncPanZoomController.cpp => gfx/layers/apz/test/gtest/TestAsyncPanZoomController.cpp
extra : source : 18f51acd98206483573be0fcf636e6fcc76e89b0
  • Loading branch information
theres-waldo committed Sep 18, 2015
1 parent 7918cf6 commit 0f6812a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
21 changes: 21 additions & 0 deletions gfx/layers/apz/test/gtest/moz.build
Original file line number Diff line number Diff line change
@@ -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']
3 changes: 3 additions & 0 deletions gfx/layers/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ CXXFLAGS += [
]
]

if CONFIG['ENABLE_TESTS']:
DIRS += ['apz/test/gtest']

MOCHITEST_MANIFESTS += ['apz/test/mochitest/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['apz/test/mochitest/chrome.ini']

Expand Down
3 changes: 0 additions & 3 deletions gfx/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
# 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']

Expand Down
1 change: 0 additions & 1 deletion gfx/tests/gtest/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ UNIFIED_SOURCES += [
'gfxSurfaceRefCountTest.cpp',
# Disabled on suspicion of causing bug 904227
#'gfxWordCacheTest.cpp',
'TestAsyncPanZoomController.cpp',
'TestBufferRotation.cpp',
'TestColorNames.cpp',
'TestCompositor.cpp',
Expand Down

0 comments on commit 0f6812a

Please sign in to comment.