commit bf843b2e195e31fec30a73784f3555a0ba7b63fe
author Jon Ashburn <jon@lunarg.com> Wed Nov 26 11:06:49 2014 -0700
committer Jon Ashburn <jon@lunarg.com> Wed Nov 26 11:23:00 2014 -0700
tree ae822598b8c13f60652e14fbee7aa083b0f16936
parent b54ef7860a744a4e1577dab34aa7cfd952a74693

tests: Fix tests to allow more than one gpu to be returned from InitAndEnum

tests/base_render_test.cpp

diff --git a/tests/base_render_test.cpp b/tests/base_render_test.cpp
index b4b829b..c773f23 100644
--- a/tests/base_render_test.cpp
+++ b/tests/base_render_test.cpp
@@ -251,7 +251,7 @@
         err = xglInitAndEnumerateGpus(&app_info, NULL,
                                       MAX_GPUS, &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
-        ASSERT_GE(1, this->gpu_count) << "No GPU available";
+        ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
         m_device = new XglDevice(0, objs[0]);
         m_device->get_device_queue();

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 8347f88..1ec381f 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -166,7 +166,7 @@
 
     err = xglInitAndEnumerateGpus(&app_info, NULL, 1, &count, &gpu);
     ASSERT_XGL_SUCCESS(err);
-    ASSERT_GE(1, count) << "No GPU available";
+    ASSERT_GE(count, 1) << "No GPU available";
 
     m_device = new XglDevice(0, gpu);
     m_device->get_device_queue();

tests/image_tests.cpp

diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 834942f..eaee05d 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -95,7 +95,7 @@
         err = xglInitAndEnumerateGpus(&app_info, NULL,
                                       MAX_GPUS, &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
-        ASSERT_GE(1, this->gpu_count) << "No GPU available";
+        ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
         this->m_device = new XglDevice(0, objs[0]);
     }

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index a4b5842..365508f 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -94,7 +94,7 @@
         err = xglInitAndEnumerateGpus(&app_info, NULL,
                                       MAX_GPUS, &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
-        ASSERT_GE(1, this->gpu_count) << "No GPU available";
+        ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
         this->m_device = new XglDevice(0, objs[0]);
     }
@@ -125,7 +125,7 @@
     err = xglInitAndEnumerateGpus(&app_info, NULL,
                                   MAX_GPUS, &gpu_count, objs);
     ASSERT_XGL_SUCCESS(err);
-    ASSERT_GE(1, gpu_count) << "No GPU available";
+    ASSERT_GE(gpu_count, 1) << "No GPU available";
 
     for (int i = 0; i < 16; i++)
         layers[i] = &layer_buf[i][0];

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index d0a65f1..688a41b 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -62,7 +62,7 @@
     err = xglInitAndEnumerateGpus(&app_info, NULL,
                                   MAX_GPUS, &this->gpu_count, objs);
     ASSERT_XGL_SUCCESS(err);
-    ASSERT_GE(1, this->gpu_count) << "No GPU available";
+    ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
     m_device = new XglDevice(0, objs[0]);
     m_device->get_device_queue();

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index d2ddae2..0b6277b 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -109,7 +109,7 @@
         err = xglInitAndEnumerateGpus(&app_info, NULL,
                                       MAX_GPUS, &this->gpu_count, objs);
         ASSERT_XGL_SUCCESS(err);
-        ASSERT_GE(1, this->gpu_count) << "No GPU available";
+        ASSERT_GE(this->gpu_count, 1) << "No GPU available";
 
         m_device = new XglDevice(0, objs[0]);
         m_device->get_device_queue();