summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 17:32:32 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-09 17:32:32 +0000
commit85f633544904e9a2e1b47ad3a713ad764c81eaf2 (patch)
tree78ad55aeacd41a6ad480a9f3a6af28040feace19 /base/base.gyp
parent53bb5675486a7a3ddb0f29482fc0217f7452f833 (diff)
downloadchromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.zip
chromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.tar.gz
chromium_src-85f633544904e9a2e1b47ad3a713ad764c81eaf2.tar.bz2
Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of header file
dependencies) from the multiprocess test and the test_suite headers to .cc files. Moves multiprocess_test to the test directory, and all of this stuff to the existing base_test_support project. I also used the base namespace. Previously other projects included this functionality just by #include because it was all inline, so I had to add dependencies on base_test_support in a few places. Moves and renames the command line switch this was using to base_switches. Move the base switch for process type to chrome switches. TEST=none BUG=none Review URL: http://codereview.chromium.org/3026055 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/3035062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp11
1 files changed, 2 insertions, 9 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 06cd124..213b5f3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -55,7 +55,9 @@
'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC',
'sources': [
# Infrastructure files.
+ 'multiprocess_test.h',
'test/run_all_unittests.cc',
+ 'test/test_suite.h',
# Tests.
'at_exit_unittest.cc',
@@ -167,7 +169,6 @@
'dependencies': [
'base',
'base_i18n',
- 'test_support_base',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
],
@@ -224,21 +225,13 @@
'type': '<(library)',
'dependencies': [
'base',
- '../testing/gmock.gyp:gmock',
- '../testing/gtest.gyp:gtest',
],
'sources': [
- 'test/multiprocess_test.cc',
- 'test/multiprocess_test.h',
- 'test/perf_test_suite.cc',
- 'test/perf_test_suite.h',
'test/test_file_util.h',
'test/test_file_util_linux.cc',
'test/test_file_util_mac.cc',
'test/test_file_util_posix.cc',
'test/test_file_util_win.cc',
- 'test/test_suite.cc',
- 'test/test_suite.h',
],
},
{