MacOSX: Fix run_all_unittests target name conflict

There is a target name conflict between packager/base/base.gyp:run_all_unittests and
media_test.gyp:run_all_unittests. Change to media_test.gyp:run_tests_with_atexit_manager to
resolve the conflict.
This commit is contained in:
Anders Hasselqvist 2016-01-20 10:46:31 +09:00 committed by KongQun Yang
parent db7bebe3fa
commit 4195c5e505
4 changed files with 5 additions and 5 deletions

View File

@ -46,7 +46,7 @@
'../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
# Depends on full protobuf to read/write with TextFormat. # Depends on full protobuf to read/write with TextFormat.
'../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use', '../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use',
'../test/media_test.gyp:run_all_unittests', '../test/media_test.gyp:run_tests_with_atexit_manager',
'media_event', 'media_event',
], ],
}, },

View File

@ -54,7 +54,7 @@
'dependencies': [ 'dependencies': [
'../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../../third_party/gflags/gflags.gyp:gflags', '../../third_party/gflags/gflags.gyp:gflags',
'../test/media_test.gyp:run_all_unittests', '../test/media_test.gyp:run_tests_with_atexit_manager',
'file', 'file',
], ],
}, },

View File

@ -10,7 +10,7 @@
], ],
'targets': [ 'targets': [
{ {
'target_name': 'run_all_unittests', 'target_name': 'run_tests_with_atexit_manager',
'type': '<(component)', 'type': '<(component)',
'sources': [ 'sources': [
'run_tests_with_atexit_manager.cc', 'run_tests_with_atexit_manager.cc',
@ -28,7 +28,7 @@
], ],
'dependencies': [ 'dependencies': [
'../../base/base.gyp:base', '../../base/base.gyp:base',
'run_all_unittests', 'run_tests_with_atexit_manager',
], ],
}, },
], ],

View File

@ -100,7 +100,7 @@
'dependencies': [ 'dependencies': [
'../base/base.gyp:base', '../base/base.gyp:base',
'../media/file/file.gyp:file', '../media/file/file.gyp:file',
'../media/test/media_test.gyp:run_all_unittests', '../media/test/media_test.gyp:run_tests_with_atexit_manager',
'../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
'mpd_builder', 'mpd_builder',