summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-15 19:58:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-15 19:58:53 +0000
commit426eb3a4fcb30d7f70148b138ce0a7d38f3cb48c (patch)
tree15579b0718c876cdd1f316a66e7bde429a61ff35
parent244924124002fb09afa5e6ccdb248f897848431b (diff)
downloadchromium_src-426eb3a4fcb30d7f70148b138ce0a7d38f3cb48c.zip
chromium_src-426eb3a4fcb30d7f70148b138ce0a7d38f3cb48c.tar.gz
chromium_src-426eb3a4fcb30d7f70148b138ce0a7d38f3cb48c.tar.bz2
Re-land just the project file changes from r55416. This makes projects that use
base test files dependent on test_support_base. TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56172 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--app/app.gyp1
-rw-r--r--chrome/chrome_installer.gypi3
-rw-r--r--chrome_frame/chrome_frame.gyp3
-rw-r--r--courgette/courgette.gyp2
-rw-r--r--gfx/gfx.gyp1
-rw-r--r--ipc/ipc.gyp1
-rw-r--r--jingle/jingle.gyp2
-rw-r--r--media/media.gyp3
-rw-r--r--net/net.gyp1
-rw-r--r--printing/printing.gyp1
-rw-r--r--remoting/remoting.gyp1
11 files changed, 18 insertions, 1 deletions
diff --git a/app/app.gyp b/app/app.gyp
index 3b10824..e146fb7 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -26,6 +26,7 @@
'dependencies': [
'app_base',
'app_resources',
+ '../base/base.gyp:test_support_base',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index d3d7046..aab12c5 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -66,6 +66,7 @@
'installer_util_strings',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
@@ -144,6 +145,7 @@
'installer_util',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
'include_dirs': [
@@ -293,6 +295,7 @@
'installer_util',
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
+ '<(DEPTH)/base/base.gyp:test_support_base',
'<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/testing/gtest.gyp:gtest',
],
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 0f996ae..d357cd7 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -116,6 +116,7 @@
'target_name': 'chrome_frame_unittests',
'type': 'executable',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'chrome_frame_ie',
@@ -219,6 +220,7 @@
'msvs_guid': '1D25715A-C8CE-4448-AFA3-8515AF22D235',
'type': 'executable',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:common',
'../chrome/chrome.gyp:utility',
@@ -450,6 +452,7 @@
'type': 'executable',
'msvs_guid': 'A1440368-4089-4E14-8864-D84D3C5714A7',
'dependencies': [
+ '../base/base.gyp:test_support_base',
'../chrome/chrome.gyp:browser',
'../chrome/chrome.gyp:renderer',
'../testing/gtest.gyp:gtest',
diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
index 7ca3dbe6..c45b3ac 100644
--- a/courgette/courgette.gyp
+++ b/courgette/courgette.gyp
@@ -92,6 +92,7 @@
'courgette_lib',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
@@ -117,6 +118,7 @@
'courgette_lib',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index 9b7e4aa..b6bfce9 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -17,6 +17,7 @@
'dependencies': [
'gfx',
'gfx_resources',
+ '../base/base.gyp:test_support_base',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 69da83b..ebc590a 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -38,6 +38,7 @@
'ipc',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index b3edc24..eafe96b 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -95,7 +95,6 @@
'sources': [
# TODO(akalin): Write our own test suite and runner.
'../base/test/run_all_unittests.cc',
- '../base/test/test_suite.h',
'notifier/base/chrome_async_socket_unittest.cc',
'notifier/listener/talk_mediator_unittest.cc',
'notifier/listener/send_update_task_unittest.cc',
@@ -108,6 +107,7 @@
'dependencies': [
'notifier',
'../base/base.gyp:base',
+ '../base/base.gyp:test_support_base',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../testing/gmock.gyp:gmock',
diff --git a/media/media.gyp b/media/media.gyp
index db0eeb0..95018fc 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -182,6 +182,7 @@
'media',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../base/base.gyp:test_support_perf',
'../testing/gtest.gyp:gtest',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ -216,6 +217,7 @@
'media',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
@@ -533,6 +535,7 @@
'omx_wrapper',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gtest.gyp:gtest',
],
'conditions': [
diff --git a/net/net.gyp b/net/net.gyp
index 4cb3225..abbbc74 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -663,6 +663,7 @@
'net_test_support',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../third_party/zlib/zlib.gyp:zlib',
diff --git a/printing/printing.gyp b/printing/printing.gyp
index ec1872a..48e31a1 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -87,6 +87,7 @@
'dependencies': [
'printing',
'../testing/gtest.gyp:gtest',
+ '../base/base.gyp:test_support_base',
],
'sources': [
'emf_win_unittest.cc',
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index b1c6e1a..fb108f6 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -342,6 +342,7 @@
'chromoting_jingle_glue',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../base/base.gyp:test_support_base',
'../gfx/gfx.gyp:gfx',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',