Track rename of "retrace" to "replay" within apitrace.

Verifying that everything still passes after the rename.

Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9398c079f384add4d58697773c5e4412484ceba..0a8dcfec3b90640be7fc3f25af7e2d4b93b28912 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ add_subdirectory (traces)
 # portable across all platforms. However, these tests all rely on
 # doing image comparisons and the current implementation of the
 # "apitrace dump-images" command relies on direct invocation of the
-# glretrace command.
+# glreplay command.
 #
 # Someday, we should have more unified commands for replaying traces,
 # dumping images, etc. At that point these cli tests should be usable

diff --git a/app_driver.py b/app_driver.py
index 0e6cc37c65c5f68ab82b82b4e16cc70f358ebe6e..cc76467a1e9684cbd3c93a21ea77eaf54314e846 100755 (executable)
--- a/app_driver.py
+++ b/app_driver.py
@@ -112,17 +112,17 @@ class AppDriver(Driver):
         'd3d11_1': 'd3d11',
     }
 
-    api_retrace_map = {
-        'gl': 'glretrace',
-        'egl_gl': 'eglretrace',
-        'egl_gles1': 'eglretrace',
-        'egl_gles2': 'eglretrace',
-        'd3d8': 'd3dretrace',
-        'd3d9': 'd3dretrace',
-        'd3d10': 'd3dretrace',
-        'd3d10_1': 'd3dretrace',
-        'd3d11': 'd3dretrace',
-        'd3d11_1': 'd3dretrace',
+    api_replay_map = {
+        'gl': 'glreplay',
+        'egl_gl': 'eglreplay',
+        'egl_gles1': 'eglreplay',
+        'egl_gles2': 'eglreplay',
+        'd3d8': 'd3dreplay',
+        'd3d9': 'd3dreplay',
+        'd3d10': 'd3dreplay',
+        'd3d10_1': 'd3dreplay',
+        'd3d11': 'd3dreplay',
+        'd3d11_1': 'd3dreplay',
     }
 
     def traceApp(self):
@@ -221,7 +221,7 @@ class AppDriver(Driver):
         sys.stdout.flush()
         sys.stderr.write('\n')
 
-        if self.api not in self.api_retrace_map:
+        if self.api not in self.api_replay_map:
             return
 
         for callNo, refImageFileName in images:
@@ -299,16 +299,16 @@ class AppDriver(Driver):
         s = json.dumps(state, sort_keys=True, indent=2)
         open(filename, 'wt').write(s)
 
-    def retrace(self):
-        if self.api not in self.api_retrace_map:
+    def replay(self):
+        if self.api not in self.api_replay_map:
             return
 
         sys.stderr.write('Retracing %s...\n' % (self.trace_file,))
 
-        p = self._retrace()
+        p = self._replay()
         p.wait()
         if p.returncode != 0:
-            fail('retrace failed with code %i' % (p.returncode))
+            fail('replay failed with code %i' % (p.returncode))
 
         sys.stdout.flush()
         sys.stderr.write('\n')
@@ -345,11 +345,11 @@ class AppDriver(Driver):
         else:
             return state
 
-        p = self._retrace(['-D', str(callNo)])
+        p = self._replay(['-D', str(callNo)])
         state = json.load(p.stdout, strict=False)
         p.wait()
         if p.returncode != 0:
-            fail('retrace returned code %i' % (p.returncode))
+            fail('replay returned code %i' % (p.returncode))
 
         self.adjustSrcState(state)
 
@@ -398,10 +398,10 @@ class AppDriver(Driver):
         except KeyError:
             pass
 
-    def _retrace(self, args = None, stdout=subprocess.PIPE):
-        retrace = self.api_retrace_map[self.api]
-        #cmd = [get_build_program(retrace)]
-        cmd = [options.apitrace, 'retrace']
+    def _replay(self, args = None, stdout=subprocess.PIPE):
+        replay = self.api_replay_map[self.api]
+        #cmd = [get_build_program(replay)]
+        cmd = [options.apitrace, 'replay']
         if self.doubleBuffer:
             cmd += ['-db']
         else:
@@ -448,7 +448,7 @@ class AppDriver(Driver):
         self.runApp()
         self.traceApp()
         self.checkTrace()
-        self.retrace()
+        self.replay()
 
         pass_()
 

diff --git a/apps/README.markdown b/apps/README.markdown
index 3820630b0bc9f5dfc482875293ee554acfea47ab..067b2535b8e171f173e5e145382fe0225d814628 100644 (file)
--- a/apps/README.markdown
+++ b/apps/README.markdown
@@ -20,7 +20,7 @@ The actual execution of the test (and parsing of the REF script) is
 performed by the python program in ../app_driver.py. This driver
 program runs the application with the given arguments, performs a
 trace of the application, checks the trace against the reference
-script, and then run a "retrace" of the application (replaying the
+script, and then run a "replay" of the application (replaying the
 commands in the trace).
 
 In addition to a dump of the expected trace content, the reference

diff --git a/apps/gl/README.markdown b/apps/gl/README.markdown
index 1272a7cb7b932a58095967163e39bada6e36931c..1eae094e31daad658004914ddd68cd5abf6b88dd 100644 (file)
--- a/apps/gl/README.markdown
+++ b/apps/gl/README.markdown
@@ -5,4 +5,4 @@ demos suite), modified to be non-interactive.
 
 Rather than cover the full breadth of OpenGL functionality, the focus here is
 to cover entrypoints that require special hand-written code to be
-traced/retraced correctly.
+traced/replayed correctly.