From ca817dc4cde244d4135be362b5ba4f8d18783817 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 3 Oct 2012 21:35:04 +0000 Subject: [PATCH] Fix interference of V8 unittest setup with other tests (issue #712). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@836 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- tests/unittests/v8_unittest.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/unittests/v8_unittest.cc b/tests/unittests/v8_unittest.cc index 7d23d43e3..f377a0b53 100644 --- a/tests/unittests/v8_unittest.cc +++ b/tests/unittests/v8_unittest.cc @@ -1592,8 +1592,8 @@ class V8RendererTest : public ClientApp::RenderDelegate { if (!value.empty()) test_mode_ = static_cast(atoi(value.ToString().c_str())); } - EXPECT_GT(test_mode_, V8TEST_NONE); - RunStartupTest(); + if (test_mode_ > V8TEST_NONE) + RunStartupTest(); } virtual void OnContextCreated(CefRefPtr app, @@ -1659,9 +1659,11 @@ class V8RendererTest : public ClientApp::RenderDelegate { V8_PROPERTY_ATTRIBUTE_NONE)); } - // Run the test asynchronously. - CefPostTask(TID_RENDERER, - NewCefRunnableMethod(this, &V8RendererTest::RunTest)); + if (test_mode_ > V8TEST_NONE) { + // Run the test asynchronously. + CefPostTask(TID_RENDERER, + NewCefRunnableMethod(this, &V8RendererTest::RunTest)); + } } protected: @@ -1775,6 +1777,7 @@ void CreateV8RendererTests(ClientApp::RenderDelegateSet& delegates) { handler->ExecuteTest(); \ EXPECT_TRUE(handler->got_message_); \ EXPECT_TRUE(handler->got_success_); \ + g_current_test_mode = V8TEST_NONE; \ } #define V8_TEST(name, test_mode) \