Skip to content

Commit

Permalink
Skip loading webgl test expectations on win gpu bots.
Browse files Browse the repository at this point in the history
So we skip the tests in previous CL, and the random crashes still happen.  So it's apparent something else is causing it.

Try to see if loading the file is the cause of unexpected random crashes.

This is temporary and will be reverted once investigation is finished.

BUG=165269
TEST=win gpu bots
TBR=kbr
Review URL: https://codereview.chromium.org/12217092

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181547 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
zmo@chromium.org committed Feb 8, 2013
1 parent 3cce4e2 commit f868ab5
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions content/browser/gpu/webgl_conformance_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,25 @@ class WebGLConformanceTest : public ContentBrowserTest {
ASSERT_TRUE(bot_config_.IsValid())
<< "Invalid bot configuration";

#if !defined(OS_WIN)
ASSERT_TRUE(test_expectations_.LoadTestExpectations(
GPUTestExpectationsParser::kWebGLConformanceTest));
#endif
}

void RunTest(const std::string& url) {
std::string test_name =
testing::UnitTest::GetInstance()->current_test_info()->name();
if (StartsWithASCII(test_name, "MANUAL_", true))
test_name = test_name.substr(strlen("MANUAL_"));
#if defined(OS_WIN)
return;
#endif
int32 expectation =
test_expectations_.GetTestExpectation(test_name, bot_config_);
if (expectation != GPUTestExpectationsParser::kGpuTestPass) {
LOG(WARNING) << "Test " << test_name << " is bypassed";
return;
} else {
#if defined(OS_WIN)
return;
#endif
}

DOMMessageQueue message_queue;
Expand Down

0 comments on commit f868ab5

Please sign in to comment.