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 /base/base.gyp | |
| 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
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 41 |
1 files changed, 36 insertions, 5 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': [ |