From 7949d2e03c697fc73f3d2ec882c08b487d1422bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 3 Nov 2011 14:21:41 +0000 Subject: [PATCH] Update for 'apitrace trace' --- driver.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/driver.py b/driver.py index 9c0b622..e219e61 100755 --- a/driver.py +++ b/driver.py @@ -97,6 +97,7 @@ class TestCase: if not os.path.exists(trace_dir): os.makedirs(trace_dir) + cmd = self.args env = os.environ.copy() system = platform.system() @@ -105,19 +106,19 @@ class TestCase: wrapper = _get_build_path('wrappers/opengl32.dll') local_wrapper = os.path.join(os.path.dirname(self.args[0]), os.path.basename(wrapper)) shutil.copy(wrapper, local_wrapper) - elif system == 'Darwin': - wrapper = _get_build_path('wrappers/OpenGL') - env['DYLD_LIBRARY_PATH'] = os.path.dirname(wrapper) + env['TRACE_FILE'] = self.trace_file else: - wrapper = _get_build_path('glxtrace.so') - env['LD_PRELOAD'] = wrapper - - env['TRACE_FILE'] = self.trace_file + apitrace = _get_build_program('apitrace') + cmd = [ + apitrace, 'trace', + '-o', self.trace_file, + '--' + ] + cmd if self.max_frames is not None: env['TRACE_FRAMES'] = str(self.max_frames) try: - p = popen(self.args, env=env, cwd=self.cwd) + p = popen(cmd, env=env, cwd=self.cwd) p.wait() finally: if local_wrapper is not None: -- 2.43.0