Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: client/site_tests/graphics_GLBench/graphics_GLBench.py

Issue 2873023: Got rid of glxinfo. (Closed) Base URL: http://src.chromium.org/git/autotest.git
Patch Set: strip board id Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/deps/glbench/src/main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/site_tests/graphics_GLBench/graphics_GLBench.py
diff --git a/client/site_tests/graphics_GLBench/graphics_GLBench.py b/client/site_tests/graphics_GLBench/graphics_GLBench.py
index ace0bba1d064ca03e65539ca28d0cbfe376c9e9e..e3c8156ba2a4d2e8df239fa002c4892143b9bf3c 100644
--- a/client/site_tests/graphics_GLBench/graphics_GLBench.py
+++ b/client/site_tests/graphics_GLBench/graphics_GLBench.py
@@ -13,15 +13,6 @@ def md5_file(filename):
return utils.system_output('md5sum ' + filename).split()[0]
-def get_board_id():
- glxinfo_output = utils.system_output(site_ui.xcommand('glxinfo'))
- match = re.search('OpenGL vendor string: (.*)', glxinfo_output)
- vendor = match.group(1) if match else 'unknown vendor'
- match = re.search('OpenGL renderer string: (.*)', glxinfo_output)
- renderer = match.group(1) if match else 'unknown renderer'
- return (vendor + ' / ' + renderer).strip()
-
-
class graphics_GLBench(test.test):
version = 1
preserve_srcdir = True
@@ -40,7 +31,9 @@ class graphics_GLBench(test.test):
'deps/glbench/src/checksums')
checksums = eval(utils.read_file(checksums_filename))
- board_id = get_board_id()
+ exefile = os.path.join(self.autodir, 'deps/glbench/glbench')
+ board_id = utils.system_output(site_ui.xcommand(exefile +
+ ' -get_board_id')).strip()
logging.info("Running on: %s", board_id)
checksum_table = checksums.get(board_id, {})
@@ -50,7 +43,6 @@ class graphics_GLBench(test.test):
else:
raise error.TestFail("No checksums found for this board: %s" % board_id)
- exefile = os.path.join(self.autodir, 'deps/glbench/glbench')
cmd = "X :1 & sleep 1; DISPLAY=:1 %s %s; kill $!" % (exefile, options)
self.results = utils.system_output(cmd, retain_output=True)
« no previous file with comments | « client/deps/glbench/src/main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698