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

Unified Diff: base/base.gyp

Issue 23132002: GTTF: Add a basic new unit test launcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed gyp cycle Created 7 years, 4 months 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
« no previous file with comments | « no previous file | base/test/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index e2af06bb6fa08ce659e82c173c698195304f2e0e..7646fed4d3a1ce6e7736769122bc359281af4de9 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -834,6 +834,7 @@
'base_i18n',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/libxml/libxml.gyp:libxml',
'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
'export_dependent_settings': [
@@ -864,6 +865,8 @@
'test/expectations/expectation.h',
'test/expectations/parser.cc',
'test/expectations/parser.h',
+ 'test/gtest_xml_util.cc',
+ 'test/gtest_xml_util.h',
'test/mock_chrome_application_mac.h',
'test/mock_chrome_application_mac.mm',
'test/mock_devices_changed_observer.cc',
@@ -927,6 +930,9 @@
'test/thread_test_helper.h',
'test/trace_event_analyzer.cc',
'test/trace_event_analyzer.h',
+ 'test/unit_test_launcher_ios.cc',
+ 'test/unit_test_launcher.cc',
+ 'test/unit_test_launcher.h',
'test/values_test_util.cc',
'test/values_test_util.h',
],
@@ -937,6 +943,10 @@
# by file name rules).
['include', '^test/test_file_util_mac\\.cc$'],
],
+ 'sources!': [
+ # iOS uses its own unit test launcher.
+ 'test/unit_test_launcher.cc',
+ ],
}],
], # target_conditions
},
« no previous file with comments | « no previous file | base/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698