commit 3b78d3192e37c786d179fa3b4d92eb6e459cd864
author Chia-I Wu <olv@lunarg.com> Mon Dec 29 15:39:23 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:03 2015 -0700
tree feb6264aeea287855edc75e8e9882e25d7ae1e3f
parent 48580a8d9bb58769ffea506b8be5e8a7d8073f2f

tests: skip XglDevice in init.cpp and image_tests.cpp

Use xgl_testing::Device directly.

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index e5673d0..221c60c 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -60,8 +60,8 @@
 
 #include <xgl.h>
 #include "gtest-1.7.0/include/gtest/gtest.h"
-
-#include "xgldevice.h"
+#include "xgltestbinding.h"
+#include "test_common.h"
 
 class XglImageTest : public ::testing::Test {
 public:
@@ -71,10 +71,10 @@
     void CreateImageView(XGL_IMAGE_VIEW_CREATE_INFO* pCreateInfo,
                          XGL_IMAGE_VIEW* pView);
     void DestroyImageView(XGL_IMAGE_VIEW imageView);
-    XGL_DEVICE device() {return m_device->device();}
+    XGL_DEVICE device() {return m_device->obj();}
 
 protected:
-    XglDevice *m_device;
+    xgl_testing::Device *m_device;
     XGL_APPLICATION_INFO app_info;
     XGL_PHYSICAL_GPU objs[XGL_MAX_PHYSICAL_GPUS];
     XGL_UINT gpu_count;
@@ -97,7 +97,8 @@
         ASSERT_XGL_SUCCESS(err);
         ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
-        this->m_device = new XglDevice(0, objs[0]);
+        this->m_device = new xgl_testing::Device(objs[0]);
+        this->m_device->init();
     }
 
     virtual void TearDown() {