diff options
| author | Brian Paul <brianp@vmware.com> | 2012-11-12 16:49:47 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-11-13 13:47:39 -0700 |
| commit | 90c1e3e3b388484f3741a03c128d29d5150aa9dd (patch) | |
| tree | 29b13053390e242e60c79aad14837441f8c44b84 | |
| parent | fa79f285de7473e8bc5bed2fa84d13a695ec7ea9 (diff) | |
framework: log output of wglinfo on Windows and Cygwin
As we do glxinfo on Linux. Note that if wglinfo.exe isn't found
you'll see a line like this in the results file:
"wglinfo": "Failed to run wglinfo",
Reviewed-by: José Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | framework/core.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/core.py b/framework/core.py index 48771cfd..5a97dba6 100644 --- a/framework/core.py +++ b/framework/core.py @@ -29,6 +29,7 @@ import platform import re import stat import subprocess +import string import sys import time import traceback @@ -389,9 +390,13 @@ class Environment: def collectData(self): result = {} - if platform.system() != 'Windows': + system = platform.system() + if (system == 'Windows' or + string.find(system, "CYGWIN_NT") == 0): + result['wglinfo'] = self.run('wglinfo') + else: result['glxinfo'] = self.run('glxinfo') - if platform.system() == 'Linux': + if system == 'Linux': result['lspci'] = self.run('lspci') return result |