Commit d8647256 authored by Mark Florisson's avatar Mark Florisson

Debugger: Don't run test suite if GDB python version < 2.6

parent 5a501ae5
...@@ -167,14 +167,15 @@ class GdbDebuggerTestCase(DebuggerTestCase): ...@@ -167,14 +167,15 @@ class GdbDebuggerTestCase(DebuggerTestCase):
p.stdout.close() p.stdout.close()
if have_gdb: if have_gdb:
python_version_script = tempfile.NamedTemporaryFile() python_version_script = tempfile.NamedTemporaryFile(mode='w+')
python_version_script.write('python import sys; print sys.version_info\n') python_version_script.write(
'python import sys; print("%s %s" % sys.version_info[:2])')
python_version_script.flush() python_version_script.flush()
p = subprocess.Popen(['gdb', '-batch', '-x', python_version_script.name], p = subprocess.Popen(['gdb', '-batch', '-x', python_version_script.name],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
python_version = p.stdout.read().decode('ascii') python_version = p.stdout.read().decode('ascii')
p.wait() p.wait()
python_version_number = [int(a.strip()) for a in python_version.strip('()').split(',')[:3]] python_version_number = [int(a) for a in python_version.split()]
if have_gdb: if have_gdb:
# Based on Lib/test/test_gdb.py # Based on Lib/test/test_gdb.py
...@@ -184,9 +185,10 @@ class GdbDebuggerTestCase(DebuggerTestCase): ...@@ -184,9 +185,10 @@ class GdbDebuggerTestCase(DebuggerTestCase):
# Be Python 3 compatible # Be Python 3 compatible
if (not have_gdb if (not have_gdb
or list(map(int, gdb_version_number)) < [7, 2] or list(map(int, gdb_version_number)) < [7, 2]
or python_version_number < [2, 5]): or python_version_number < [2, 6]):
self.p = None self.p = None
warnings.warn('Skipping gdb tests, need gdb >= 7.2 with Python >= 2.5') warnings.warn(
'Skipping gdb tests, need gdb >= 7.2 with Python >= 2.6')
else: else:
self.p = subprocess.Popen( self.p = subprocess.Popen(
args, args,
......
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