Commit bb134678 by Geoff Lang

Added a gtest environment class to initialize the ANGLETest class window.

Change-Id: I6fa59201364960cc8fe1cb44e2d09a14cf61dd8a Reviewed-on: https://chromium-review.googlesource.com/179352Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Commit-Queue: Nicolas Capens <nicolascapens@chromium.org> Tested-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 79bb0d9e
......@@ -320,3 +320,16 @@ bool ANGLETest::destroyEGLContext()
return true;
}
void ANGLETestEnvironment::SetUp()
{
if (!ANGLETest::InitTestWindow())
{
FAIL() << "Failed to create ANGLE test window.";
}
}
void ANGLETestEnvironment::TearDown()
{
ANGLETest::DestroyTestWindow();
}
......@@ -104,4 +104,11 @@ class ANGLETest : public testing::Test
static EGLNativeDisplayType mNativeDisplay;
};
class ANGLETestEnvironment : public testing::Environment
{
public:
virtual void SetUp();
virtual void TearDown();
};
#endif // ANGLE_TESTS_ANGLE_TEST_H_
......@@ -10,15 +10,8 @@
int main(int argc, char** argv)
{
if (!ANGLETest::InitTestWindow())
{
return -1;
}
testing::InitGoogleMock(&argc, argv);
testing::AddGlobalTestEnvironment(new ANGLETestEnvironment());
int rt = RUN_ALL_TESTS();
ANGLETest::DestroyTestWindow();
return rt;
}
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