Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Unified Diff: mojo/mojo.gyp

Issue 68203005: Mojo: Make tests under mojo/public use our own run_all_unittests.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 7f07480ca806f1fcecc294df20538366d1f224d2..fadf7fae6ab7108b4260fc9dbaccd1ca7be8fb25 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -45,6 +45,18 @@
],
},
{
+ 'target_name': 'mojo_run_all_unittests',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
+ 'mojo_system',
+ ],
+ 'sources': [
+ 'common/test/run_all_unittests.cc',
+ ],
+ },
+ {
'target_name': 'mojo_common_lib',
'type': '<(component)',
'defines': [
@@ -75,14 +87,13 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:base',
- '../base/base.gyp:run_all_unittests',
'../testing/gtest.gyp:gtest',
'mojo_common_lib',
+ 'mojo_run_all_unittests',
'mojo_system',
],
'sources': [
'common/handle_watcher_unittest.cc',
- 'common/test/run_all_unittests.cc',
],
'conditions': [
['OS == "win"', {
@@ -97,10 +108,10 @@
'target_name': 'mojo_public_unittests',
'type': 'executable',
'dependencies': [
- '../base/base.gyp:run_all_unittests',
'../testing/gtest.gyp:gtest',
'mojo_bindings',
'mojo_public_test_support',
+ 'mojo_run_all_unittests',
'mojo_system',
],
'sources': [
@@ -116,6 +127,7 @@
'../base/base.gyp:test_support_perf',
'../testing/gtest.gyp:gtest',
'mojo_public_test_support',
+ 'mojo_run_all_unittests',
'mojo_system',
],
'sources': [

Powered by Google App Engine
This is Rietveld 408576698