diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 11:26:59 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 11:26:59 +0000 |
| commit | bff7f4cd5aa817ac00f2a40f29fdb957acabc337 (patch) | |
| tree | b8b7ae0f68b305f9c65d1a9765ae5319442bb15a /base/threading | |
| parent | 9ad8d30e04d6408c672eb5ff87484151badc9875 (diff) | |
| download | chromium_src-bff7f4cd5aa817ac00f2a40f29fdb957acabc337.zip chromium_src-bff7f4cd5aa817ac00f2a40f29fdb957acabc337.tar.gz chromium_src-bff7f4cd5aa817ac00f2a40f29fdb957acabc337.tar.bz2 | |
Give the post-and-reply worker pool test a chance to finish on iOS
Since some iOS devices are single-core, a busy loop on one thread can
starve the thread that the test is waiting for to finish.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10810061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/threading')
| -rw-r--r-- | base/threading/worker_pool_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc index 10ca4f1..5021b2f 100644 --- a/base/threading/worker_pool_unittest.cc +++ b/base/threading/worker_pool_unittest.cc @@ -98,6 +98,11 @@ TEST_F(WorkerPoolTest, MAYBE_PostTaskAndReply) { const TimeDelta kMaxDuration = TestTimeouts::tiny_timeout(); TimeTicks start = TimeTicks::Now(); while (!tester->finished() && TimeTicks::Now() - start < kMaxDuration) { +#if defined(OS_IOS) + // Ensure that the other thread has a chance to run even on a single-core + // device. + pthread_yield_np(); +#endif MessageLoop::current()->RunAllPending(); } EXPECT_TRUE(tester->finished()); |