commit 2802979d4dc3ccc666d08c0dc90c144c65ffa503
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Sep 04 16:26:02 2014 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Sep 10 16:44:58 2014 -0600
tree eb6b3a642209fe57c73622969853296ead571e07
parent d0d7ccc3f23046c7610a561e3eb99bb71eb5bd60

tests: Update render_test to use XglTestFramework class

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 573c621..83bbbfd 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -68,7 +68,7 @@
 #include "xglimage.h"
 #include "icd-bil.h"
 
-#include "displayengine.h"
+#include "xgltestframework.h"
 
 //--------------------------------------------------------------------------------------
 // Mesh and VertexFormat Data
@@ -193,7 +193,8 @@
                                                     // urb 0 write HWord interleave complete mlen 3 rlen 0 { align16 1Q EOT };
 };
 
-class XglRenderTest : public ::testing::Test {
+class XglRenderTest : public XglTestFramework
+{
 public:
     void CreateQueryPool(XGL_QUERY_TYPE type, XGL_UINT slots,
                          XGL_QUERY_POOL *pPool, XGL_GPU_MEMORY *pMem);
@@ -204,7 +205,6 @@
     void InitPipeline();
     void InitMesh( XGL_UINT32 numVertices, XGL_GPU_SIZE vbStride, const void* vertices );
     void DrawTriangleTest();
-    DisplayEngine m_screen;
 
 protected:
     XGL_APPLICATION_INFO app_info;
@@ -722,8 +722,9 @@
     const ::testing::TestInfo* const test_info =
       ::testing::UnitTest::GetInstance()->current_test_info();
 
-    renderTarget->WritePPM(test_info->test_case_name());
+//    renderTarget->WritePPM(test_info->test_case_name());
 //    m_screen.Display(renderTarget, m_image_mem);
+    RecordImage(renderTarget);
 
     ASSERT_XGL_SUCCESS(xglDestroyObject(pipeline));
     ASSERT_XGL_SUCCESS(xglDestroyObject(m_cmdBuffer));
@@ -740,7 +741,13 @@
 }
 
 int main(int argc, char **argv) {
+    int result;
+
     ::testing::InitGoogleTest(&argc, argv);
-    glutInit(&argc, argv);
-    return RUN_ALL_TESTS();
+    XglTestFramework::InitArgs(&argc, argv);
+
+    result = RUN_ALL_TESTS();
+
+    XglTestFramework::Finish();
+    return result;
 }