Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Unified Diff: content/common/gpu/client/gpu_context_tests.h

Issue 1812033002: Restore earlyouts in SignalTests on Windows for IPC flavour of the tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: earlyouts: . Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/gpu_ipc_browsertests.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/gpu_context_tests.h
diff --git a/content/common/gpu/client/gpu_context_tests.h b/content/common/gpu/client/gpu_context_tests.h
index 11cc3b981860a1fd31652187bb6933068b913c4c..30f6daa52c22b5810f444be119ac1970560cc847 100644
--- a/content/common/gpu/client/gpu_context_tests.h
+++ b/content/common/gpu/client/gpu_context_tests.h
@@ -42,6 +42,13 @@ class SignalTest : public ContextTestBase {
};
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();
gl_->ShallowFlushCHROMIUM();
@@ -52,6 +59,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalSyncTokenTest) {
};
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
// immediately.
gpu::SyncToken sync_token;
@@ -59,6 +73,13 @@ CONTEXT_TEST_F(SignalTest, EmptySignalSyncTokenTest) {
};
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
// immediately.
gpu::SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0,
@@ -68,6 +89,13 @@ CONTEXT_TEST_F(SignalTest, InvalidSignalSyncTokenTest) {
};
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;
gl_->GenQueriesEXT(1, &query);
gl_->BeginQueryEXT(GL_COMMANDS_ISSUED_CHROMIUM, query);
@@ -78,6 +106,13 @@ CONTEXT_TEST_F(SignalTest, BasicSignalQueryTest) {
};
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;
gl_->GenQueriesEXT(1, &query);
TestSignalQuery(query);
@@ -85,6 +120,13 @@ CONTEXT_TEST_F(SignalTest, SignalQueryUnboundTest) {
};
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
// immediately.
TestSignalQuery(928729087);
« no previous file with comments | « content/browser/gpu/gpu_ipc_browsertests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698