Re-enable atomic counter tests on !windows

There is a bug that prevents us from running these tests on the windows bots. This change enables them on other platforms so we don't lose coverage. Bug: angleproject:3738 Change-Id: I9b546c3223499af88b347f8a01be8edb245c19a7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1950654 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Re-enable atomic counter tests on !windows
c3f0352d · Shahbaz Youssefi · Commit Bot · 61c6aecc · c3f0352d
Commit c3f0352d authored Dec 04, 2019 by Shahbaz Youssefi Committed by Commit Bot Dec 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

AtomicCounterBufferTest.cpp src/tests/gl_tests/AtomicCounterBufferTest.cpp +5 -2

No files found.
--- a/src/tests/gl_tests/AtomicCounterBufferTest.cpp
+++ b/src/tests/gl_tests/AtomicCounterBufferTest.cpp
@@ -439,8 +439,10 @@ void main()
 // on Vulkan makes every shard our bots currently make do have at least some OpenGL test run before
 // any Vulkan test. When these tests can be enabled on Vulkan, can replace the current macros with
 // the updated macros below that include Vulkan:
-// ANGLE_INSTANTIATE_TEST_ES3_AND_ES31(AtomicCounterBufferTest);
+#if !defined(ANGLE_PLATFORM_WINDOWS)
-// ANGLE_INSTANTIATE_TEST_ES31(AtomicCounterBufferTest31);
+ANGLE_INSTANTIATE_TEST_ES3_AND_ES31(AtomicCounterBufferTest);
+ANGLE_INSTANTIATE_TEST_ES31(AtomicCounterBufferTest31);
+#else
 ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest,
                       ES3_OPENGL(),
                       ES3_OPENGLES(),
@@ -448,5 +450,6 @@ ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest,
                       ES31_OPENGLES(),
                       ES31_D3D11());
 ANGLE_INSTANTIATE_TEST(AtomicCounterBufferTest31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
+#endif
 }  // namespace