mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Revert of Move a good set of gfx unit tests into gfx_unittests target. (https://codereview.chromium.org/280973003/) 

Reason for revert:
Speculative revert: Compilation appears broken on http://chromegw.corp.google.com/i/chromium.linux/builders/Linux%20Builder%20%28dbg%29 after this CL, with libgfx-related errors:

FAILED: /b/build/goma/gomacc c++ -Wl,-z,now -Wl,-z,relro -Wl,--fatal-warnings -pthread -Wl,-z,noexecstack -fPIC -B/b/build/slave/Linux_Builder__dbg_/build/src/third_party/binutils/Linux_x64/Release/bin -Wl,--disable-new-dtags -L. -Wl,-uIsHeapProfilerRunning,-uProfilerStart -Wl,-u_Z21InitialMallocHook_NewPKvj,-u_Z22InitialMallocHook_MMapPKvS0_jiiix,-u_Z22InitialMallocHook_SbrkPKvi -Wl,-u_Z21InitialMallocHook_NewPKvm,-u_Z22InitialMallocHook_MMapPKvS0_miiil,-u_Z22InitialMallocHook_SbrkPKvl -Wl,-u_ZN15HeapLeakChecker12IgnoreObjectEPKv,-u_ZN15HeapLeakChecker14UnIgnoreObjectEPKv -m64 -Wl,--icf=none -Wl,-rpath=\$ORIGIN/lib/ -Wl,-rpath-link=lib/ -o gfx_unittests -Wl,--start-group obj/ui/gfx/gfx_unittests.font_unittest.o obj/ui/gfx/image/gfx_unittests.image_family_unittest.o obj/ui/gfx/image/gfx_unittests.image_skia_unittest.o obj/ui/gfx/image/gfx_unittests.image_unittest.o obj/ui/gfx/image/gfx_unittests.image_unittest_util.o obj/ui/gfx/test/gfx_unittests.run_all_unittests.o obj/ui/gfx/gfx_unittests.text_elider_unittest.o obj/ui/gfx/gfx_unittests.text_utils_unittest.o obj/ui/gfx/animation/gfx_unittests.animation_container_unittest.o obj/ui/gfx/animation/gfx_unittests.animation_unittest.o obj/ui/gfx/animation/gfx_unittests.multi_animation_unittest.o obj/ui/gfx/animation/gfx_unittests.slide_animation_unittest.o obj/ui/gfx/animation/gfx_unittests.tween_unittest.o obj/ui/gfx/gfx_unittests.blit_unittest.o obj/ui/gfx/gfx_unittests.break_list_unittest.o obj/ui/gfx/codec/gfx_unittests.jpeg_codec_unittest.o obj/ui/gfx/codec/gfx_unittests.png_codec_unittest.o obj/ui/gfx/gfx_unittests.color_analysis_unittest.o obj/ui/gfx/gfx_unittests.color_utils_unittest.o obj/ui/gfx/gfx_unittests.display_unittest.o obj/ui/gfx/geometry/gfx_unittests.box_unittest.o obj/ui/gfx/geometry/gfx_unittests.cubic_bezier_unittest.o obj/ui/gfx/geometry/gfx_unittests.insets_unittest.o obj/ui/gfx/geometry/gfx_unittests.matrix3_unittest.o obj/ui/gfx/geometry/gfx_unittests.point_unittest.o obj/ui/gfx/geometry/gfx_unittests.point3_unittest.o obj/ui/gfx/geometry/gfx_unittests.quad_unittest.o obj/ui/gfx/geometry/gfx_unittests.r_tree_unittest.o obj/ui/gfx/geometry/gfx_unittests.rect_unittest.o obj/ui/gfx/geometry/gfx_unittests.safe_integer_conversions_unittest.o obj/ui/gfx/geometry/gfx_unittests.size_unittest.o obj/ui/gfx/geometry/gfx_unittests.vector2d_unittest.o obj/ui/gfx/geometry/gfx_unittests.vector3d_unittest.o obj/ui/gfx/image/gfx_unittests.image_util_unittest.o obj/ui/gfx/range/gfx_unittests.range_unittest.o obj/ui/gfx/gfx_unittests.sequential_id_generator_unittest.o obj/ui/gfx/gfx_unittests.shadow_value_unittest.o obj/ui/gfx/gfx_unittests.skbitmap_operations_unittest.o obj/ui/gfx/gfx_unittests.skrect_conversion_unittest.o obj/ui/gfx/gfx_unittests.transform_util_unittest.o obj/ui/gfx/gfx_unittests.utf16_indexing_unittest.o obj/ui/gfx/gfx_unittests.transform_unittest.o obj/ui/gfx/gfx_unittests.interpolated_transform_unittest.o obj/ui/gfx/gfx_unittests.platform_font_pango_unittest.o obj/base/libtest_support_base.a obj/testing/libgtest.a obj/third_party/libpng/libpng.a obj/ui/gfx/libgfx_test_support.a obj/base/allocator/liballocator.a obj/base/libbase_static.a obj/testing/libgmock.a obj/third_party/libxml/libxml2.a obj/third_party/zlib/libchrome_zlib.a obj/base/third_party/dynamic_annotations/libdynamic_annotations.a lib/libui_base.so lib/libgfx.so lib/libicuuc.so lib/libskia.so lib/libbase.so lib/libgfx_geometry.so lib/libbase_i18n.so -Wl,--end-group -lrt -ldl -lfontconfig -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpango-1.0 -lfreetype -lgobject-2.0 -lglib-2.0
lib/libgfx.so:error: undefined reference to 'XCreateRegion'
lib/libgfx.so:error: undefined reference to 'XUnionRectWithRegion'
lib/libgfx.so:error: undefined reference to 'XPolygonRegion'
collect2: ld returned 1 exit status

Original issue's description:
> Move a good set of gfx unit tests into gfx_unittests target.
> 
> This requires to major changes:
> 
> 1- It requires the introduction of GfxTestSuite to allow us to
> initialize the ResourceBundle which is required for some of these tests
> to pass.
> 2- It requires to split gfx_unittests target out of gfx.gyp, into
> gfx_tests.gyp. This is necessary because otherwise a circular dependency
> between ui_base.gyp and gfx.gyp would arise.
> 
> The circular dependency is the form of:
> gfx.gyp -> ui_base.gyp -> gfx.gyp
> 
> And is created because gfx_unittests now requires ResourceBundle to link
> which is in ui_base target.
> 
> BUG=331829
> TEST=ui_unittests,gfx_unittests
> R=danakj@chromium.org
> TBR=ben@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270586

TBR=ben@chromium.org,danakj@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=331829

Review URL: https://codereview.chromium.org/290453002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@270600 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
vabr@chromium.org 2014-05-15 06:45:02 +00:00
Родитель 818642cf68
Коммит deefdc270a
1 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
all.gyp
Просмотреть файл

@ -38,7 +38,7 @@
['OS=="ios"', {
'dependencies': [
'../ios/ios.gyp:*',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
],
}],
@ -256,7 +256,7 @@
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
@ -770,7 +770,7 @@
'../sql/sql.gyp:sql_unittests_apk',
'../sync/sync.gyp:sync_unit_tests_apk',
'../ui/events/events.gyp:events_unittests_apk',
'../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
'../ui/gfx/gfx.gyp:gfx_unittests_apk',
'../ui/ui_unittests.gyp:ui_unittests_apk',
'../android_webview/android_webview.gyp:android_webview_test_apk',
'../chrome/chrome.gyp:chrome_shell_test_apk',
@ -870,7 +870,7 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
@ -905,7 +905,7 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
@ -953,7 +953,7 @@
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../url/url.gyp:url_unittests',
],
@ -1004,7 +1004,7 @@
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
'../tools/telemetry/telemetry.gyp:*',
'../ui/events/events.gyp:events_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
@ -1108,7 +1108,7 @@
'../sql/sql.gyp:sql_unittests',
'../sync/sync.gyp:sync_unit_tests',
'../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/ui_unittests.gyp:ui_unittests',
'../ui/views/views.gyp:views_unittests',
'../url/url.gyp:url_unittests',
@ -1158,7 +1158,8 @@
'../ui/aura/aura.gyp:*',
'../ui/compositor/compositor.gyp:*',
'../ui/events/events.gyp:*',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/wm/wm.gyp:*',
'../ui/gfx/gfx.gyp:gfx_unittests',
'../ui/keyboard/keyboard.gyp:*',
'../ui/message_center/message_center.gyp:*',
'../ui/snapshot/snapshot.gyp:snapshot_unittests',
@ -1166,7 +1167,6 @@
'../ui/views/examples/examples.gyp:views_examples_with_content_exe',
'../ui/views/views.gyp:views',
'../ui/views/views.gyp:views_unittests',
'../ui/wm/wm.gyp:*',
'../webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp:webkit_compositor_bindings_unittests',
'blink_tests',
],