X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=mesademos.py;h=7fc17aabde8c7ef06bf35e651682ed014e841c6c;hb=5263168ed6c8ae77cf87759aa8fae0ab13981a95;hp=2f6ef3db73bbd6efdb0cfb4ae6526344770655cc;hpb=1848be9dd66b7a97b94278273586174a4d6fd2d2;p=apitrace-tests

diff --git a/mesademos.py b/mesademos.py
index 2f6ef3d..7fc17aa 100755
--- a/mesademos.py
+++ b/mesademos.py
@@ -83,20 +83,21 @@ def runtest(demo):
     trace = os.path.abspath(demo.replace('/', '-') + '.trace')
 
     env = os.environ.copy()
-    env['LD_PRELOAD'] = os.path.abspath('glxtrace.so')
+    env['LD_PRELOAD'] = os.path.abspath(os.path.join(options.build, 'glxtrace.so'))
     env['TRACE_FILE'] = trace
     
     args = [os.path.join('.', basename)]
-    p = popen(args, env=env, cwd=dirname, stdout=subprocess.PIPE)
+    p = popen(args, env=env, cwd=dirname)
     time.sleep(1)
 
     # http://stackoverflow.com/questions/151407/how-to-get-an-x11-window-from-a-process-id
     ref_image = demo.replace('/', '-') + '.ref.png'
-    subprocess.call('xwd -name \'%s\' | xwdtopnm | pnmtopng > %s' % (args[0], ref_image), shell=True, stdout=subprocess.PIPE)
+    #subprocess.call(['xwininfo', '-root', '-tree'])
+    subprocess.call("xwd -name '%s' | xwdtopnm | pnmtopng > '%s'" % (args[0], ref_image), shell=True)
 
     os.kill(p.pid, signal.SIGTERM)
 
-    p = popen(['./tracedump', trace], stdout=subprocess.PIPE)
+    p = popen([os.path.join(options.build, 'tracedump'), trace], stdout=subprocess.PIPE)
     stdout, _ = p.communicate()
 
     call_re = re.compile('^([0-9]+) (\w+)\(')
@@ -113,9 +114,11 @@ def runtest(demo):
                 double_buffer = True
         #print orig_line
 
-    args = ['./glretrace']
+    args = [os.path.join(options.build, 'glretrace')]
     if double_buffer:
         args += ['-db']
+    else:
+        args += ['-sb']
     args += ['-s', '/tmp/' + demo.replace('/', '-') + '.']
     args += [trace]
     p = popen(args, stdout=subprocess.PIPE)
@@ -682,19 +685,23 @@ def main():
     optparser.add_option(
         '--build', metavar='PATH',
         type='string', dest='build', default='.',
-        help='path to apitrace build')
-
+        help='path to apitrace build [default=%default]')
     optparser.add_option(
         '--mesa-demos', metavar='PATH',
         type='string', dest='mesa_demos', default=os.environ.get('MESA_DEMOS'),
-        help='path to mesa demos')
+        help='path to Mesa demos [default=%default]')
 
     (options, args) = optparser.parse_args(sys.argv[1:])
-    if args:
-        tests = args
 
-    for test in tests:
-       runtest(test)
+    if not options.mesa_demos:
+        optparser.error('path to Mesa demos not specified')
+
+    if args:
+        for test in args:
+           runtest(test)
+    else:
+        for test in tests:
+           runtest(test)
 
 
 if __name__ == '__main__':