Commit 1bbe2d3a authored by danakj's avatar danakj Committed by Commit bot

Restore earlyouts in SignalTests on Windows for IPC flavour of the tests

These tests fail to set up correctly on Windows, so running the tests
just crashes. Restore the early outs with an ifdef for windows so we
document where the early out will happen, along with comments.

R=kbr@chromium.org, piman@chromium.org
BUG=595823, 584497

Review URL: https://codereview.chromium.org/1812033002

Cr-Commit-Position: refs/heads/master@{#381802}
parent e73a0c64
...@@ -30,6 +30,8 @@ const content::CauseForGpuLaunch kInitCause = ...@@ -30,6 +30,8 @@ const content::CauseForGpuLaunch kInitCause =
class ContextTestBase : public content::ContentBrowserTest { class ContextTestBase : public content::ContentBrowserTest {
public: public:
void SetUpOnMainThread() override { void SetUpOnMainThread() override {
// This may leave the provider_ null in some cases, so tests need to early
// out.
if (!content::BrowserGpuChannelHostFactory::CanUseForTesting()) if (!content::BrowserGpuChannelHostFactory::CanUseForTesting())
return; return;
...@@ -71,8 +73,8 @@ class ContextTestBase : public content::ContentBrowserTest { ...@@ -71,8 +73,8 @@ class ContextTestBase : public content::ContentBrowserTest {
} }
protected: protected:
gpu::gles2::GLES2Interface* gl_; gpu::gles2::GLES2Interface* gl_ = nullptr;
gpu::ContextSupport* context_support_; gpu::ContextSupport* context_support_ = nullptr;
private: private:
scoped_refptr<content::ContextProviderCommandBuffer> provider_; scoped_refptr<content::ContextProviderCommandBuffer> provider_;
......
...@@ -42,6 +42,13 @@ class SignalTest : public ContextTestBase { ...@@ -42,6 +42,13 @@ class SignalTest : public ContextTestBase {
}; };
CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) { CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM(); const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
gl_->ShallowFlushCHROMIUM(); gl_->ShallowFlushCHROMIUM();
...@@ -52,6 +59,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) { ...@@ -52,6 +59,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) {
}; };
CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) { CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
// Signalling something that doesn't exist should run the callback // Signalling something that doesn't exist should run the callback
// immediately. // immediately.
gpu::SyncToken sync_token; gpu::SyncToken sync_token;
...@@ -59,6 +73,13 @@ CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) { ...@@ -59,6 +73,13 @@ CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) {
}; };
CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) { CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
// Signalling something that doesn't exist should run the callback // Signalling something that doesn't exist should run the callback
// immediately. // immediately.
gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
...@@ -68,6 +89,13 @@ CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) { ...@@ -68,6 +89,13 @@ CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) {
}; };
CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) { CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
unsigned query; unsigned query;
gl_->GenQueriesEXT(1, &query); gl_->GenQueriesEXT(1, &query);
gl_->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query); gl_->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query);
...@@ -78,6 +106,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) { ...@@ -78,6 +106,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) {
}; };
CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) { CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
GLuint query; GLuint query;
gl_->GenQueriesEXT(1, &query); gl_->GenQueriesEXT(1, &query);
TestSignalQuery(query); TestSignalQuery(query);
...@@ -85,6 +120,13 @@ CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) { ...@@ -85,6 +120,13 @@ CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) {
}; };
CONTEXT_TEST_F(SignalTest, InvalidSignalQueryUnboundTest) { CONTEXT_TEST_F(SignalTest, InvalidSignalQueryUnboundTest) {
#if defined(OS_WIN)
// The IPC version of ContextTestBase::SetUpOnMainThread does not succeed on
// some platforms.
if (!gl_)
return;
#endif
// Signalling something that doesn't exist should run the callback // Signalling something that doesn't exist should run the callback
// immediately. // immediately.
TestSignalQuery(928729087); TestSignalQuery(928729087);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment