diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 20:58:55 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 20:58:55 +0000 |
| commit | 021b2b6263e646eeb6ee96b5e9521bf1096ec4cc (patch) | |
| tree | 71113823c668a1d9e9c32282ef1752de6f021a5b /base | |
| parent | 5780dfd9973151e6859c42f8d8824c4e8fd6f877 (diff) | |
| download | chromium_src-021b2b6263e646eeb6ee96b5e9521bf1096ec4cc.zip chromium_src-021b2b6263e646eeb6ee96b5e9521bf1096ec4cc.tar.gz chromium_src-021b2b6263e646eeb6ee96b5e9521bf1096ec4cc.tar.bz2 | |
Fix compilation error on Windows and link error on Mac
Review URL: http://codereview.chromium.org/8781
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4320 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_unittest.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/base/process_util_unittest.cc b/base/process_util_unittest.cc index 1ba0ee2..4073afd 100644 --- a/base/process_util_unittest.cc +++ b/base/process_util_unittest.cc @@ -44,18 +44,14 @@ MULTIPROCESS_TEST_MAIN(SlowChildProcess) { } #if defined(OS_WIN) -#define EXE_SUFFIX ".exe" +#define EXE_SUFFIX L".exe" #else -#define EXE_SUFFIX "" +#define EXE_SUFFIX L"" #endif // TODO(port): finish port on Mac -#if defined(OS_MACOSX) -TEST_F(ProcessUtilTest, DISABLED_KillSlowChild) -#else -TEST_F(ProcessUtilTest, KillSlowChild) -#endif -{ +#if !defined(OS_MACOSX) +TEST_F(ProcessUtilTest, KillSlowChild) { remove("SlowChildProcess.die"); int oldcount = process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0); @@ -69,6 +65,7 @@ TEST_F(ProcessUtilTest, KillSlowChild) PlatformThread::Sleep(1000); EXPECT_EQ(oldcount, process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0)); } +#endif // TODO(estade): if possible, port these 2 tests. #if defined(OS_WIN) |