Kaydet (Commit) ad0cfe3d authored tarafından Thomas Heller's avatar Thomas Heller

Do not try to load the GLUT library in the ctypes tests. This test

adds little value, but has a large problem on OS X, as explained in
SF# 1581906.
üst 1fd1cc5b
...@@ -7,25 +7,21 @@ from ctypes.test import is_resource_enabled ...@@ -7,25 +7,21 @@ from ctypes.test import is_resource_enabled
if sys.platform == "win32": if sys.platform == "win32":
lib_gl = find_library("OpenGL32") lib_gl = find_library("OpenGL32")
lib_glu = find_library("Glu32") lib_glu = find_library("Glu32")
lib_glut = find_library("glut32")
lib_gle = None lib_gle = None
elif sys.platform == "darwin": elif sys.platform == "darwin":
lib_gl = lib_glu = find_library("OpenGL") lib_gl = lib_glu = find_library("OpenGL")
lib_glut = find_library("GLUT")
lib_gle = None lib_gle = None
else: else:
lib_gl = find_library("GL") lib_gl = find_library("GL")
lib_glu = find_library("GLU") lib_glu = find_library("GLU")
lib_glut = find_library("glut")
lib_gle = find_library("gle") lib_gle = find_library("gle")
## print, for debugging ## print, for debugging
if is_resource_enabled("printing"): if is_resource_enabled("printing"):
if lib_gl or lib_glu or lib_glut or lib_gle: if lib_gl or lib_glu or lib_gle:
print "OpenGL libraries:" print "OpenGL libraries:"
for item in (("GL", lib_gl), for item in (("GL", lib_gl),
("GLU", lib_glu), ("GLU", lib_glu),
("glut", lib_glut),
("gle", lib_gle)): ("gle", lib_gle)):
print "\t", item print "\t", item
...@@ -33,24 +29,11 @@ if is_resource_enabled("printing"): ...@@ -33,24 +29,11 @@ if is_resource_enabled("printing"):
# On some systems, loading the OpenGL libraries needs the RTLD_GLOBAL mode. # On some systems, loading the OpenGL libraries needs the RTLD_GLOBAL mode.
class Test_OpenGL_libs(unittest.TestCase): class Test_OpenGL_libs(unittest.TestCase):
def setUp(self): def setUp(self):
self.gl = self.glu = self.gle = self.glut = None self.gl = self.glu = self.gle = None
if lib_gl: if lib_gl:
self.gl = CDLL(lib_gl, mode=RTLD_GLOBAL) self.gl = CDLL(lib_gl, mode=RTLD_GLOBAL)
if lib_glu: if lib_glu:
self.glu = CDLL(lib_glu, RTLD_GLOBAL) self.glu = CDLL(lib_glu, RTLD_GLOBAL)
if lib_glut:
# On some systems, additional libraries seem to be
# required, loading glut fails with
# "OSError: /usr/lib/libglut.so.3: undefined symbol: XGetExtensionVersion"
# I cannot figure out how to repair the test on these
# systems (red hat), so we ignore it when the glut or gle
# libraries cannot be loaded. See also:
# https://sourceforge.net/tracker/?func=detail&atid=105470&aid=1478253&group_id=5470
# http://mail.python.org/pipermail/python-dev/2006-May/064789.html
try:
self.glut = CDLL(lib_glut)
except OSError:
pass
if lib_gle: if lib_gle:
try: try:
self.gle = CDLL(lib_gle) self.gle = CDLL(lib_gle)
...@@ -67,11 +50,6 @@ class Test_OpenGL_libs(unittest.TestCase): ...@@ -67,11 +50,6 @@ class Test_OpenGL_libs(unittest.TestCase):
if self.glu: if self.glu:
self.glu.gluBeginCurve self.glu.gluBeginCurve
if lib_glut:
def test_glut(self):
if self.glut:
self.glut.glutWireTetrahedron
if lib_gle: if lib_gle:
def test_gle(self): def test_gle(self):
if self.gle: if self.gle:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment