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

diff --git a/mesademos.py b/mesademos.py
index 6b9519e..2f6ef3d 100755
--- a/mesademos.py
+++ b/mesademos.py
@@ -47,6 +47,12 @@ def ansi_strip(s):
 
 
 def popen(command, *args, **kwargs):
+    if 'cwd' in kwargs:
+        sys.stdout.write('cd %s && ' % kwargs['cwd'])
+    if 'env' in kwargs:
+        for name, value in kwargs['env'].iteritems():
+            if value != os.environ.get(name, None):
+                sys.stdout.write('%s=%s ' % (name, value))
     sys.stdout.write(' '.join(command) + '\n')
     sys.stdout.flush()
     return subprocess.Popen(command, *args, **kwargs)
@@ -82,7 +88,7 @@ def runtest(demo):
     
     args = [os.path.join('.', basename)]
     p = popen(args, env=env, cwd=dirname, stdout=subprocess.PIPE)
-    time.sleep(0.5)
+    time.sleep(1)
 
     # http://stackoverflow.com/questions/151407/how-to-get-an-x11-window-from-a-process-id
     ref_image = demo.replace('/', '-') + '.ref.png'
@@ -123,7 +129,7 @@ def runtest(demo):
     
     if image:
         delta_image = demo.replace('/', '-') + '.diff.png'
-        p = popen(["compare", '-metric', 'AE', '-fuzz', '5%', '-extract', '250x250', ref_image, image, delta_image])
+        p = popen(["compare", '-alpha', 'opaque', '-metric', 'AE', '-fuzz', '5%', ref_image, image, delta_image])
         _, stderr = p.communicate()