summaryrefslogtreecommitdiff
path: root/suites
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2013-01-11 14:52:27 -0800
committerKenneth Graunke <kenneth@whitecape.org>2013-01-11 15:05:27 -0800
commit6e3b1330a975ae46d3e180ed4c444075371b9fa8 (patch)
tree16e2e160239199c05f025523adcfa67fe42ba6dd /suites
parent8e65e2c49c2f5a40b2fb99efaabb6ab853b14e3d (diff)
Make Piglit run in the proper directoryHEADmaster
Diffstat (limited to 'suites')
-rw-r--r--suites/piglit.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/suites/piglit.py b/suites/piglit.py
index 2add243..5de9634 100644
--- a/suites/piglit.py
+++ b/suites/piglit.py
@@ -47,8 +47,8 @@ skip_re = re.compile(r"^PIGLIT: *{ *'result': *'skip' *}")
pass_re = re.compile(r"^PIGLIT: *{ *'result': *'pass' *}")
class PiglitTest(Test):
- def __init__(self, test, cmd):
- Test.__init__(self, shlex.split(cmd))
+ def __init__(self, cmd):
+ Test.__init__(self, shlex.split(cmd), piglit_path)
def interpretResult(self, out, err, exitcode):
if skip_re.search(out) is not None:
@@ -60,11 +60,11 @@ class PiglitTest(Test):
def makeTestList():
# XXX: can't handle glean yet.
- (out, _, _, _) = runProgram([path.join(piglit_path, 'piglit-print-commands.py'), '-x', 'glean', 'tests/quick.tests'], None)
+ (out, _, _, _) = runProgram(['python2', 'piglit-print-commands.py', '-x', 'glean', 'tests/quick.tests'], None, piglit_path)
d = {}
for l in out.splitlines():
test, cmd = l.split(' ::: ')
- d['piglit/' + test] = PiglitTest(test, cmd)
+ d['piglit/' + test] = PiglitTest(cmd)
return d