diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 18:35:06 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 18:35:06 +0000 |
| commit | 7d1ba939f09dbca3ac8a968dd0e695bb788c90d9 (patch) | |
| tree | 73f6389f555e2d1bdfff583136626330f7c3ce30 | |
| parent | c5e1142167484f453d7b834d19eb5ff778bbb52d (diff) | |
| download | chromium_src-7d1ba939f09dbca3ac8a968dd0e695bb788c90d9.zip chromium_src-7d1ba939f09dbca3ac8a968dd0e695bb788c90d9.tar.gz chromium_src-7d1ba939f09dbca3ac8a968dd0e695bb788c90d9.tar.bz2 | |
Move test_file_util out of libbase. Test code should not be mixed with production code.
Rename previous test_support_base to test_support_perf. I couldn't just add things
to test_support_base because one file there defined main, and it would produce
link conflict for new users of test_support_base.
TEST=none
http://crbug.com/18101
Review URL: http://codereview.chromium.org/159791
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22291 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gyp | 41 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | net/net.gyp | 5 |
3 files changed, 44 insertions, 7 deletions
diff --git a/base/base.gyp b/base/base.gyp index 94d2cfb..6c76edb 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -297,11 +297,6 @@ 'system_monitor_posix.cc', 'system_monitor_win.cc', 'task.h', - 'test_file_util.h', - 'test_file_util_linux.cc', - 'test_file_util_mac.cc', - 'test_file_util_posix.cc', - 'test_file_util_win.cc', 'thread.cc', 'thread.h', 'thread_collision_warner.cc', @@ -699,6 +694,42 @@ 'type': '<(library)', 'dependencies': [ 'base', + ], + 'sources': [ + 'test_file_util.h', + 'test_file_util_linux.cc', + 'test_file_util_mac.cc', + 'test_file_util_posix.cc', + 'test_file_util_win.cc', + ], + 'conditions': [ + [ 'OS == "linux"', { + 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], + ['exclude', '\\.mm?$' ] ], + 'conditions': [ + [ 'chromeos==1', { + 'sources/': [ ['include', '_chromeos\\.cc$'] ] + }, + ], + ], + }, + ], + [ 'OS == "mac"', { + 'sources/': [ ['exclude', '_(linux|win|chromeos)\\.cc$'] ], + }, + ], + [ 'OS == "win"', { + 'sources/': [ ['exclude', '_(linux|mac|posix|chromeos)\\.cc$'], + ['exclude', '\\.mm?$' ] ], + }, + ], + ], + }, + { + 'target_name': 'test_support_perf', + 'type': '<(library)', + 'dependencies': [ + 'base', '../testing/gtest.gyp:gtest', ], 'sources': [ diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 56a34c6..009c6b6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3388,6 +3388,7 @@ 'chrome_resources', 'chrome_strings', 'theme_resources', + '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -4388,6 +4389,7 @@ 'msvs_guid': '4539AFB3-B8DC-47F3-A491-6DAC8FD26657', 'dependencies': [ '../base/base.gyp:base', + '../base/base.gyp:test_support_base', ], 'sources': [ 'tools/perf/flush_cache/flush_cache.cc', @@ -4421,6 +4423,7 @@ 'chrome_strings', '../base/base.gyp:base', '../base/base.gyp:test_support_base', + '../base/base.gyp:test_support_perf', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../webkit/webkit.gyp:glue', @@ -4474,6 +4477,7 @@ 'chrome_resources', 'debugger', 'test_support_common', + '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu38/icu38.gyp:icui18n', @@ -4830,6 +4834,7 @@ 'installer/installer.gyp:installer_util_strings', 'debugger', 'renderer', + '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu38/icu38.gyp:icui18n', diff --git a/net/net.gyp b/net/net.gyp index 651c232..ab5972c 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -562,6 +562,7 @@ 'net_test_support', '../base/base.gyp:base', '../base/base.gyp:test_support_base', + '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', ], 'msvs_guid': 'AAC78796-B9A2-4CD9-BF89-09B03E92BF73', @@ -676,7 +677,7 @@ 'dependencies': [ 'net', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', + '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', ], 'msvs_guid': 'DABB8796-B9A2-4CD9-BF89-09B03E92B123', @@ -690,7 +691,7 @@ 'dependencies': [ 'net', '../base/base.gyp:base', - '../base/base.gyp:test_support_base', + '../base/base.gyp:test_support_perf', '../testing/gtest.gyp:gtest', ], 'msvs_guid': 'DABB8796-B9A2-4CD9-BF89-09B03E92B124', |