commit 5220b01a7e4c6293d5c42e6032397c4f87b09808
author U. Artie Eoff <ullysses.a.eoff@intel.com> Thu Apr 02 18:21:17 2020 -0700
committer U. Artie Eoff <ullysses.a.eoff@intel.com> Wed May 13 09:45:10 2020 -0700
tree ca39e7c470e95f3aae05ed7defa4154bb1c78f06
parent c85cfdd5fe5ee143213af57c7daaf04dfe59947e

test/fixture: fix GCC 10.0.1 error with drmDevicePaths

drmDevicePaths is static/constant and only used in one
method (getDisplay).  Thus, it is unnecessary to declare
it as a member variable.  Instead, just declare and
initialize in getDisplay and use proper C++ semantics.

This also fixes a GCC 10.0.1 error due to improper
C++11 constructor list-initialization syntax:

  error: list-initialize for non-class type must not
         be parenthesized.

Fixes #191

Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>

test/test_va_api_fixture.cpp

diff --git a/test/test_va_api_fixture.cpp b/test/test_va_api_fixture.cpp
index 7738454..a0eafa6 100644
--- a/test/test_va_api_fixture.cpp
+++ b/test/test_va_api_fixture.cpp
@@ -39,7 +39,6 @@
     , m_vaDisplay(NULL)
     , m_restoreDriverName(getenv("LIBVA_DRIVER_NAME"))
     , m_drmHandle(-1)
-    , drmDevicePaths({ "/dev/dri/renderD128", "/dev/dri/card0" })
     , m_configID(VA_INVALID_ID)
     , m_contextID(VA_INVALID_ID)
     , m_bufferID(VA_INVALID_ID)
@@ -73,10 +72,14 @@
 
 VADisplay VAAPIFixture::getDisplay()
 {
-    uint32_t i;
+    typedef std::vector<std::string> DevicePaths;
+    typedef DevicePaths::const_iterator DevicePathsIterator;
 
-    for (i = 0; i < sizeof(drmDevicePaths) / sizeof(*drmDevicePaths); i++) {
-        m_drmHandle = open(drmDevicePaths[i].c_str(), O_RDWR);
+    static DevicePaths paths({"/dev/dri/renderD128", "/dev/dri/card0"});
+
+    const DevicePathsIterator endIt(paths.end());
+    for (DevicePathsIterator it(paths.begin()); it != endIt; ++it) {
+        m_drmHandle = open(it->c_str(), O_RDWR);
         if (m_drmHandle < 0)
             continue;
         m_vaDisplay = vaGetDisplayDRM(m_drmHandle);

test/test_va_api_fixture.h

diff --git a/test/test_va_api_fixture.h b/test/test_va_api_fixture.h
index 4f711b8..88a9b34 100644
--- a/test/test_va_api_fixture.h
+++ b/test/test_va_api_fixture.h
@@ -102,7 +102,6 @@
 private:
     char *m_restoreDriverName;
     int m_drmHandle;
-    const std::string drmDevicePaths[2];
 
     VAConfigID m_configID;
     VAContextID m_contextID;