0

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
This commit is contained in:
dkegel@google.com
2008-10-31 20:58:55 +00:00
parent 5780dfd997
commit 021b2b6263

@ -44,18 +44,14 @@ MULTIPROCESS_TEST_MAIN(SlowChildProcess) {
} }
#if defined(OS_WIN) #if defined(OS_WIN)
#define EXE_SUFFIX ".exe" #define EXE_SUFFIX L".exe"
#else #else
#define EXE_SUFFIX "" #define EXE_SUFFIX L""
#endif #endif
// TODO(port): finish port on Mac // TODO(port): finish port on Mac
#if defined(OS_MACOSX) #if !defined(OS_MACOSX)
TEST_F(ProcessUtilTest, DISABLED_KillSlowChild) TEST_F(ProcessUtilTest, KillSlowChild) {
#else
TEST_F(ProcessUtilTest, KillSlowChild)
#endif
{
remove("SlowChildProcess.die"); remove("SlowChildProcess.die");
int oldcount = process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0); int oldcount = process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0);
@ -69,6 +65,7 @@ TEST_F(ProcessUtilTest, KillSlowChild)
PlatformThread::Sleep(1000); PlatformThread::Sleep(1000);
EXPECT_EQ(oldcount, process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0)); EXPECT_EQ(oldcount, process_util::GetProcessCount(L"base_unittests" EXE_SUFFIX, 0));
} }
#endif
// TODO(estade): if possible, port these 2 tests. // TODO(estade): if possible, port these 2 tests.
#if defined(OS_WIN) #if defined(OS_WIN)