Index: cc/cc_tests.gyp |
=================================================================== |
--- cc/cc_tests.gyp (revision 214760) |
+++ cc/cc_tests.gyp (working copy) |
@@ -6,89 +6,89 @@ |
'variables': { |
'chromium_code': 1, |
'cc_unit_tests_source_files': [ |
- 'animation/animation_unittest.cc', |
- 'animation/keyframed_animation_curve_unittest.cc', |
- 'animation/layer_animation_controller_unittest.cc', |
- 'animation/scrollbar_animation_controller_linear_fade_unittest.cc', |
- 'animation/timing_function_unittest.cc', |
- 'animation/transform_operations_unittest.cc', |
- 'base/float_quad_unittest.cc', |
- 'base/math_util_unittest.cc', |
- 'base/region_unittest.cc', |
- 'base/scoped_ptr_vector_unittest.cc', |
- 'base/tiling_data_unittest.cc', |
- 'base/util_unittest.cc', |
- 'input/top_controls_manager_unittest.cc', |
- 'layers/content_layer_unittest.cc', |
- 'layers/contents_scaling_layer_unittest.cc', |
- 'layers/delegated_renderer_layer_impl_unittest.cc', |
- 'layers/heads_up_display_unittest.cc', |
- 'layers/layer_impl_unittest.cc', |
- 'layers/layer_iterator_unittest.cc', |
- 'layers/layer_position_constraint_unittest.cc', |
- 'layers/layer_unittest.cc', |
- 'layers/nine_patch_layer_impl_unittest.cc', |
- 'layers/nine_patch_layer_unittest.cc', |
- 'layers/picture_image_layer_impl_unittest.cc', |
- 'layers/picture_layer_impl_unittest.cc', |
- 'layers/render_surface_unittest.cc', |
- 'layers/scrollbar_layer_unittest.cc', |
- 'layers/solid_color_layer_impl_unittest.cc', |
- 'layers/texture_layer_unittest.cc', |
- 'layers/tiled_layer_impl_unittest.cc', |
- 'layers/tiled_layer_unittest.cc', |
- 'output/delegating_renderer_unittest.cc', |
- 'output/filter_operations_unittest.cc', |
- 'output/gl_renderer_unittest.cc', |
- 'output/output_surface_unittest.cc', |
- 'output/renderer_pixeltest.cc', |
- 'output/render_surface_filters_unittest.cc', |
- 'output/shader_unittest.cc', |
- 'output/software_renderer_unittest.cc', |
- 'quads/draw_quad_unittest.cc', |
- 'quads/render_pass_unittest.cc', |
- 'resources/layer_quad_unittest.cc', |
- 'resources/picture_layer_tiling_set_unittest.cc', |
- 'resources/picture_layer_tiling_unittest.cc', |
- 'resources/picture_pile_impl_unittest.cc', |
- 'resources/picture_pile_unittest.cc', |
- 'resources/picture_unittest.cc', |
- 'resources/prioritized_resource_unittest.cc', |
- 'resources/raster_worker_pool_unittest.cc', |
- 'resources/resource_provider_unittest.cc', |
- 'resources/resource_update_controller_unittest.cc', |
- 'resources/scoped_resource_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/fake_web_graphics_context_3d_unittest.cc', |
- 'trees/damage_tracker_unittest.cc', |
- 'trees/layer_sorter_unittest.cc', |
- 'trees/layer_tree_host_common_unittest.cc', |
- 'trees/layer_tree_host_impl_unittest.cc', |
- 'trees/layer_tree_host_pixeltest_filters.cc', |
- 'trees/layer_tree_host_pixeltest_masks.cc', |
- 'trees/layer_tree_host_pixeltest_on_demand_raster.cc', |
- 'trees/layer_tree_host_pixeltest_readback.cc', |
- 'trees/layer_tree_host_unittest_animation.cc', |
+# 'animation/animation_unittest.cc', |
aelias_OOO_until_Jul13
2013/07/31 21:00:30
Please remove these commented-out tests before sub
powei
2013/07/31 21:29:39
Done.
|
+# 'animation/keyframed_animation_curve_unittest.cc', |
+# 'animation/layer_animation_controller_unittest.cc', |
+# 'animation/scrollbar_animation_controller_linear_fade_unittest.cc', |
+# 'animation/timing_function_unittest.cc', |
+# 'animation/transform_operations_unittest.cc', |
+# 'base/float_quad_unittest.cc', |
+# 'base/math_util_unittest.cc', |
+# 'base/region_unittest.cc', |
+# 'base/scoped_ptr_vector_unittest.cc', |
+# 'base/tiling_data_unittest.cc', |
+# 'base/util_unittest.cc', |
+# 'input/top_controls_manager_unittest.cc', |
+# 'layers/content_layer_unittest.cc', |
+# 'layers/contents_scaling_layer_unittest.cc', |
+# 'layers/delegated_renderer_layer_impl_unittest.cc', |
+# 'layers/heads_up_display_unittest.cc', |
+# 'layers/layer_impl_unittest.cc', |
+# 'layers/layer_iterator_unittest.cc', |
+# 'layers/layer_position_constraint_unittest.cc', |
+# 'layers/layer_unittest.cc', |
+# 'layers/nine_patch_layer_impl_unittest.cc', |
+# 'layers/nine_patch_layer_unittest.cc', |
+# 'layers/picture_image_layer_impl_unittest.cc', |
+# 'layers/picture_layer_impl_unittest.cc', |
+# 'layers/render_surface_unittest.cc', |
+# 'layers/scrollbar_layer_unittest.cc', |
+# 'layers/solid_color_layer_impl_unittest.cc', |
+# 'layers/texture_layer_unittest.cc', |
+# 'layers/tiled_layer_impl_unittest.cc', |
+# 'layers/tiled_layer_unittest.cc', |
+# 'output/delegating_renderer_unittest.cc', |
+# 'output/filter_operations_unittest.cc', |
+# 'output/gl_renderer_unittest.cc', |
+# 'output/output_surface_unittest.cc', |
+# 'output/renderer_pixeltest.cc', |
+# 'output/render_surface_filters_unittest.cc', |
+# 'output/shader_unittest.cc', |
+# 'output/software_renderer_unittest.cc', |
+# 'quads/draw_quad_unittest.cc', |
+# 'quads/render_pass_unittest.cc', |
+# 'resources/layer_quad_unittest.cc', |
+# 'resources/picture_layer_tiling_set_unittest.cc', |
+# 'resources/picture_layer_tiling_unittest.cc', |
+# 'resources/picture_pile_impl_unittest.cc', |
+# 'resources/picture_pile_unittest.cc', |
+# 'resources/picture_unittest.cc', |
+# 'resources/prioritized_resource_unittest.cc', |
+# 'resources/raster_worker_pool_unittest.cc', |
+# 'resources/resource_provider_unittest.cc', |
+# 'resources/resource_update_controller_unittest.cc', |
+# 'resources/scoped_resource_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/fake_web_graphics_context_3d_unittest.cc', |
+# 'trees/damage_tracker_unittest.cc', |
+# 'trees/layer_sorter_unittest.cc', |
+# 'trees/layer_tree_host_common_unittest.cc', |
+# 'trees/layer_tree_host_impl_unittest.cc', |
+# 'trees/layer_tree_host_pixeltest_filters.cc', |
+# 'trees/layer_tree_host_pixeltest_masks.cc', |
+# 'trees/layer_tree_host_pixeltest_on_demand_raster.cc', |
+# 'trees/layer_tree_host_pixeltest_readback.cc', |
+# 'trees/layer_tree_host_unittest_animation.cc', |
'trees/layer_tree_host_unittest.cc', |
- 'trees/layer_tree_host_unittest_context.cc', |
- '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_picture.cc', |
- 'trees/layer_tree_host_unittest_scroll.cc', |
- 'trees/layer_tree_host_unittest_video.cc', |
- 'trees/occlusion_tracker_unittest.cc', |
- 'trees/quad_culler_unittest.cc', |
- 'trees/tree_synchronizer_unittest.cc', |
+# 'trees/layer_tree_host_unittest_context.cc', |
+# '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_picture.cc', |
+# 'trees/layer_tree_host_unittest_scroll.cc', |
+# 'trees/layer_tree_host_unittest_video.cc', |
+# 'trees/occlusion_tracker_unittest.cc', |
+# 'trees/quad_culler_unittest.cc', |
+# 'trees/tree_synchronizer_unittest.cc', |
], |
'cc_tests_support_files': [ |
'test/animation_test_common.cc', |
@@ -135,6 +135,8 @@ |
'test/fake_output_surface.h', |
'test/fake_output_surface_client.cc', |
'test/fake_output_surface_client.h', |
+ 'test/fake_scoped_ui_resource.cc', |
+ 'test/fake_scoped_ui_resource.h', |
'test/fake_video_frame_provider.cc', |
'test/fake_video_frame_provider.h', |
'test/geometry_test_utils.cc', |