diff options
Diffstat (limited to 'chromium/cc/cc_tests.gyp')
| -rw-r--r-- | chromium/cc/cc_tests.gyp | 83 |
1 files changed, 60 insertions, 23 deletions
diff --git a/chromium/cc/cc_tests.gyp b/chromium/cc/cc_tests.gyp index 4974ad39e18..af160850bc1 100644 --- a/chromium/cc/cc_tests.gyp +++ b/chromium/cc/cc_tests.gyp @@ -12,13 +12,15 @@ 'animation/scroll_offset_animation_curve_unittest.cc', 'animation/scrollbar_animation_controller_linear_fade_unittest.cc', 'animation/scrollbar_animation_controller_thinning_unittest.cc', - 'animation/timing_function_unittest.cc', 'animation/transform_operations_unittest.cc', + 'base/delayed_unique_notifier_unittest.cc', 'base/float_quad_unittest.cc', 'base/math_util_unittest.cc', 'base/region_unittest.cc', + 'base/rolling_time_delta_history_unittest.cc', 'base/scoped_ptr_vector_unittest.cc', 'base/tiling_data_unittest.cc', + 'base/unique_notifier_unittest.cc', 'base/util_unittest.cc', 'debug/micro_benchmark_controller_unittest.cc', 'input/top_controls_manager_unittest.cc', @@ -29,28 +31,39 @@ 'layers/delegated_renderer_layer_impl_unittest.cc', 'layers/heads_up_display_unittest.cc', 'layers/heads_up_display_layer_impl_unittest.cc', + 'layers/io_surface_layer_impl_unittest.cc', 'layers/layer_impl_unittest.cc', 'layers/layer_iterator_unittest.cc', 'layers/layer_position_constraint_unittest.cc', 'layers/layer_unittest.cc', + 'layers/layer_utils_unittest.cc', 'layers/nine_patch_layer_impl_unittest.cc', 'layers/nine_patch_layer_unittest.cc', + 'layers/painted_scrollbar_layer_impl_unittest.cc', 'layers/picture_image_layer_impl_unittest.cc', 'layers/picture_layer_impl_unittest.cc', 'layers/picture_layer_unittest.cc', 'layers/render_surface_unittest.cc', + 'layers/render_surface_impl_unittest.cc', 'layers/scrollbar_layer_unittest.cc', 'layers/solid_color_layer_impl_unittest.cc', + 'layers/solid_color_scrollbar_layer_impl_unittest.cc', + 'layers/surface_layer_impl_unittest.cc', 'layers/texture_layer_unittest.cc', + 'layers/texture_layer_impl_unittest.cc', 'layers/tiled_layer_impl_unittest.cc', 'layers/tiled_layer_unittest.cc', 'layers/ui_resource_layer_impl_unittest.cc', 'layers/ui_resource_layer_unittest.cc', + 'layers/video_layer_impl_unittest.cc', + 'output/begin_frame_args_unittest.cc', 'output/delegating_renderer_unittest.cc', 'output/filter_operations_unittest.cc', 'output/gl_renderer_unittest.cc', 'output/output_surface_unittest.cc', + 'output/overlay_unittest.cc', 'output/renderer_pixeltest.cc', + 'output/renderer_unittest.cc', 'output/shader_unittest.cc', 'output/software_renderer_unittest.cc', 'quads/draw_quad_unittest.cc', @@ -67,18 +80,17 @@ 'resources/resource_provider_unittest.cc', 'resources/resource_update_controller_unittest.cc', 'resources/scoped_resource_unittest.cc', + 'resources/task_graph_runner_unittest.cc', 'resources/texture_mailbox_deleter_unittest.cc', + 'resources/texture_uploader_unittest.cc', 'resources/tile_manager_unittest.cc', 'resources/tile_priority_unittest.cc', 'resources/video_resource_updater_unittest.cc', - 'resources/worker_pool_unittest.cc', 'scheduler/delay_based_time_source_unittest.cc', - 'scheduler/frame_rate_controller_unittest.cc', - 'scheduler/rolling_time_delta_history_unittest.cc', 'scheduler/scheduler_state_machine_unittest.cc', 'scheduler/scheduler_unittest.cc', - 'scheduler/texture_uploader_unittest.cc', 'test/layer_tree_json_parser_unittest.cc', + 'test/ordered_simple_task_runner_unittest.cc', 'test/test_web_graphics_context_3d_unittest.cc', 'trees/damage_tracker_unittest.cc', 'trees/layer_sorter_unittest.cc', @@ -96,16 +108,27 @@ 'trees/layer_tree_host_unittest_damage.cc', 'trees/layer_tree_host_unittest_delegated.cc', 'trees/layer_tree_host_unittest_occlusion.cc', + 'trees/layer_tree_host_unittest_no_message_loop.cc', 'trees/layer_tree_host_unittest_picture.cc', + 'trees/layer_tree_host_unittest_proxy.cc', 'trees/layer_tree_host_unittest_scroll.cc', 'trees/layer_tree_host_unittest_video.cc', + 'trees/layer_tree_impl_unittest.cc', 'trees/occlusion_tracker_unittest.cc', - 'trees/quad_culler_unittest.cc', 'trees/tree_synchronizer_unittest.cc', ], + 'cc_surfaces_unit_tests_source_files': [ + 'surfaces/surface_aggregator_test_helpers.cc', + 'surfaces/surface_aggregator_test_helpers.h', + 'surfaces/surface_aggregator_unittest.cc', + 'surfaces/surface_unittest.cc', + 'surfaces/surfaces_pixeltest.cc', + ], 'cc_tests_support_files': [ 'test/animation_test_common.cc', 'test/animation_test_common.h', + 'test/begin_frame_args_test.cc', + 'test/begin_frame_args_test.h', 'test/fake_content_layer.cc', 'test/fake_content_layer.h', 'test/fake_content_layer_client.cc', @@ -141,6 +164,8 @@ 'test/fake_picture_pile_impl.h', 'test/fake_proxy.cc', 'test/fake_proxy.h', + 'test/fake_renderer_client.cc', + 'test/fake_renderer_client.h', 'test/fake_rendering_stats_instrumentation.h', 'test/fake_scoped_ui_resource.cc', 'test/fake_scoped_ui_resource.h', @@ -154,22 +179,26 @@ 'test/fake_ui_resource_layer_tree_host_impl.h', 'test/fake_video_frame_provider.cc', 'test/fake_video_frame_provider.h', - 'test/fake_web_graphics_context_3d.cc', - 'test/fake_web_graphics_context_3d.h', 'test/geometry_test_utils.cc', 'test/geometry_test_utils.h', + 'test/test_in_process_context_provider.cc', + 'test/test_in_process_context_provider.h', 'test/impl_side_painting_settings.h', 'test/layer_test_common.cc', 'test/layer_test_common.h', + 'test/layer_tree_host_common_test.cc', + 'test/layer_tree_host_common_test.h', 'test/layer_tree_json_parser.cc', 'test/layer_tree_json_parser.h', 'test/layer_tree_pixel_test.cc', 'test/layer_tree_pixel_test.h', 'test/layer_tree_test.cc', 'test/layer_tree_test.h', + 'test/mock_occlusion_tracker.h', 'test/mock_quad_culler.cc', 'test/mock_quad_culler.h', - 'test/occlusion_tracker_test_common.h', + 'test/ordered_simple_task_runner.cc', + 'test/ordered_simple_task_runner.h', 'test/ordered_texture_map.cc', 'test/ordered_texture_map.h', 'test/paths.cc', @@ -200,6 +229,9 @@ 'test/test_context_support.h', 'test/test_gles2_interface.cc', 'test/test_gles2_interface.h', + 'test/test_occlusion_tracker.h', + 'test/test_shared_bitmap_manager.cc', + 'test/test_shared_bitmap_manager.h', 'test/test_texture.cc', 'test/test_texture.h', 'test/test_tile_priorities.cc', @@ -224,21 +256,23 @@ '../testing/gtest.gyp:gtest', '../ui/events/events.gyp:events_base', '../ui/gfx/gfx.gyp:gfx', - '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', + '../ui/gfx/gfx.gyp:gfx_geometry', 'cc.gyp:cc', + 'cc.gyp:cc_surfaces', 'cc_test_support', ], 'sources': [ 'test/run_all_unittests.cc', 'test/cc_test_suite.cc', '<@(cc_unit_tests_source_files)', + '<@(cc_surfaces_unit_tests_source_files)', ], 'include_dirs': [ 'test', '.', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', @@ -248,7 +282,7 @@ [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 'conditions': [ - [ 'linux_use_tcmalloc==1', + [ 'use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', @@ -275,27 +309,30 @@ '../testing/gtest.gyp:gtest', '../testing/perf/perf_test.gyp:*', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', 'cc.gyp:cc', 'cc_test_support', ], 'sources': [ 'layers/layer_perftest.cc', + 'layers/picture_layer_impl_perftest.cc', 'resources/picture_layer_tiling_perftest.cc', + 'resources/picture_pile_impl_perftest.cc', 'resources/raster_worker_pool_perftest.cc', + 'resources/task_graph_runner_perftest.cc', 'resources/tile_manager_perftest.cc', - 'resources/worker_pool_perftest.cc', 'test/cc_test_suite.cc', - 'test/lap_timer.cc', 'test/run_all_perftests.cc', 'trees/layer_tree_host_common_perftest.cc', 'trees/layer_tree_host_perftest.cc', + 'trees/occlusion_tracker_perftest.cc', ], 'include_dirs': [ 'test', '.', ], 'conditions': [ - ['OS == "android" and gtest_target_type == "shared_library"', + ['OS == "android"', { 'dependencies': [ '../testing/android/native_test.gyp:native_test_native_code', @@ -303,7 +340,7 @@ } ], # See http://crbug.com/162998#c4 for why this is needed. - ['OS=="linux" and linux_use_tcmalloc==1', + ['OS=="linux" and use_allocator!="none"', { 'dependencies': [ '../base/allocator/allocator.gyp:allocator', @@ -325,15 +362,19 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../gpu/gpu.gyp:gles2_c_lib', + '../gpu/gpu.gyp:gles2_implementation', + '../gpu/gpu.gyp:gl_in_process_context', '../gpu/gpu.gyp:gpu_unittest_utils', + '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', - '../third_party/WebKit/public/blink.gyp:blink_minimal', '../third_party/mesa/mesa.gyp:osmesa', '../ui/gfx/gfx.gyp:gfx', + '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/gfx/gfx.gyp:gfx_test_support', '../ui/gl/gl.gyp:gl', - '../ui/ui_unittests.gyp:ui_test_support', ], 'sources': [ '<@(cc_tests_support_files)', @@ -343,9 +384,7 @@ }, ], 'conditions': [ - # Special target to wrap a gtest_target_type==shared_library - # cc_unittests into an android apk for execution. - ['OS == "android" and gtest_target_type == "shared_library"', + ['OS == "android"', { 'targets': [ { @@ -356,7 +395,6 @@ ], 'variables': { 'test_suite_name': 'cc_unittests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_unittests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi' ], }, @@ -368,7 +406,6 @@ ], 'variables': { 'test_suite_name': 'cc_perftests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)cc_perftests<(SHARED_LIB_SUFFIX)', }, 'includes': [ '../build/apk_test.gypi' ], }, |