diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-07-07 14:42:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-07 14:42:12 -0700 |
| commit | 798ff739a1da6bea3f5f3ff13b580062e1a3a03a (patch) | |
| tree | 32ae8b1e4db1db831b457a90e273f30b09f7965f | |
| parent | 5100c063a8784140a8d29b0082e6a3291a92d1f2 (diff) | |
| parent | 47dd726460e3a02ec80f14e300bb3a42884fc1e5 (diff) | |
| download | frameworks_native-798ff739a1da6bea3f5f3ff13b580062e1a3a03a.zip frameworks_native-798ff739a1da6bea3f5f3ff13b580062e1a3a03a.tar.gz frameworks_native-798ff739a1da6bea3f5f3ff13b580062e1a3a03a.tar.bz2 | |
Merge "SurfaceTexture: enable newly passing tests."
| -rw-r--r-- | libs/gui/tests/SurfaceTexture_test.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index c06400e..88433fb 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -1180,8 +1180,7 @@ protected: sp<FrameCondition> mFC; }; -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageBeforeFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, UpdateTexImageBeforeFrameFinishedWorks) { class PT : public ProducerThread { virtual void render() { glClearColor(0.0f, 1.0f, 0.0f, 1.0f); @@ -1199,8 +1198,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageBeforeFrameFinishedWorks // TODO: Add frame verification once RGB TEX_EXTERNAL_OES is supported! } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageAfterFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, UpdateTexImageAfterFrameFinishedWorks) { class PT : public ProducerThread { virtual void render() { glClearColor(0.0f, 1.0f, 0.0f, 1.0f); @@ -1218,8 +1216,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_UpdateTexImageAfterFrameFinishedWorks) // TODO: Add frame verification once RGB TEX_EXTERNAL_OES is supported! } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageBeforeFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, RepeatedUpdateTexImageBeforeFrameFinishedWorks) { enum { NUM_ITERATIONS = 1024 }; class PT : public ProducerThread { @@ -1247,8 +1244,7 @@ TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageBeforeFrameFinis } } -// XXX: This test is disabled because it causes hangs on some devices. -TEST_F(SurfaceTextureGLToGLTest, DISABLED_RepeatedUpdateTexImageAfterFrameFinishedWorks) { +TEST_F(SurfaceTextureGLToGLTest, RepeatedUpdateTexImageAfterFrameFinishedWorks) { enum { NUM_ITERATIONS = 1024 }; class PT : public ProducerThread { |