GH#134 Remove some old cruft wrt getting gl/opengl but still handle oserrors

Author: mcfletch

OpenGL/platform/glx.py

@@ -1,4 +1,5 @@
 """GLX (x-windows)-specific platform features"""
+
 import ctypes, ctypes.util
 from OpenGL.platform import baseplatform, ctypesloader
 
@@ -11,22 +12,16 @@ class GLXPlatform(baseplatform.BasePlatform):
     # references to GL/GLU functions).
     @baseplatform.lazy_property
     def GL(self):
-        try:
-            for name in ('OpenGL', 'GL'):
+        for name in ('OpenGL', 'GL'):
+            try:
                 lib = ctypesloader.loadLibrary(
                     ctypes.cdll, name, mode=ctypes.RTLD_GLOBAL
                 )
-                if lib:
-                    return lib
-            raise ImportError("Unable to find an OpenGL or GL library")
-        except OSError as err:
-            try:
-                # libGL was the original name, older devices likely still need it...
-                return ctypesloader.loadLibrary(
-                    ctypes.cdll, "GL", mode=ctypes.RTLD_GLOBAL
-                )
             except OSError as err:
-                raise ImportError("Unable to load OpenGL library", *err.args)
+                lib = None
+            if lib:
+                return lib
+        raise ImportError("Unable to load OpenGL or GL library")
 
     @baseplatform.lazy_property
     def GLU(self):

tests/test_checks.py

@@ -74,17 +74,20 @@ def test_x():
                 "Test did not produce output: %s",
                 stderr.decode('utf-8', errors='ignore'),
             )
-            raise RuntimeError('Test script failure')
+            raise RuntimeError('Test script failure on %s' % (func.__name__))
         if 'SKIP' in lines:
-            raise pytest.skip("Skipped by executable")
+            raise pytest.skip("Skipped by executable on %s" % (func.__name__))
         elif 'OK' in lines:
             return
         else:
             log.error(
-                "Failing check script output: %s",
+                "Failing check script stderr: %s",
                 stderr.decode('utf-8', errors='ignore'),
             )
-            print(output)
+            log.error(
+                "Failing check script stdout: %s",
+                output,
+            )
             raise RuntimeError("Test Failed")
 
     return test_x