s/tracedump/apitrace dump/

diff --git a/driver.py b/driver.py
index 48b04ece6a355f021ee27592b660aecd687b44d6..9c0b62283daa5900a7b4f708dedb96e796d0adf6 100755 (executable)
--- a/driver.py
+++ b/driver.py
@@ -130,7 +130,7 @@ class TestCase:
 
     def dump(self):
 
-        cmd = [_get_build_program('tracedump'), '--color=never', self.trace_file]
+        cmd = [_get_build_program('apitrace'), 'dump', '--color=never', self.trace_file]
         p = popen(cmd, stdout=subprocess.PIPE)
 
         swapbuffers = 0
@@ -158,7 +158,7 @@ class TestCase:
                         ref_line = ref.readline().rstrip()
         p.wait()
         if p.returncode != 0:
-            self.fail('tracedump returned code %i' % p.returncode)
+            self.fail('`apitrace dump` returned code %i' % p.returncode)
         if ref_line:
             self.fail('missing call %s' % ref_line)
 

diff --git a/test.py b/test.py
index b3d2ed9722a51a886dc6e4807e752e49acc77a26..b21512897b3634f92b9c029265941f861d44b69a 100755 (executable)
--- a/test.py
+++ b/test.py
@@ -244,7 +244,7 @@ class TestCase:
             sys.stdout.write('SKIP (no trace)\n')
             return
  
-        p = popen([self._get_build_path('tracedump'), trace], stdout=subprocess.PIPE)
+        p = popen([self._get_build_path('apitrace'), 'dump', '--color', trace], stdout=subprocess.PIPE)
         call_re = re.compile('^([0-9]+) (\w+)\(')
         swapbuffers = 0
         flushes = 0
@@ -263,7 +263,7 @@ class TestCase:
                     flushes += 1
         p.wait()
         if p.returncode != 0:
-            sys.stdout.write('FAIL (tracedump)\n')
+            sys.stdout.write('FAIL (apitrace dump)\n')
             return
 
         args = [self._get_build_path('glretrace')]