From 0b29bda206005f204d685d6333849488a9ce32c5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 17 Jun 2015 10:03:04 +0100 Subject: [PATCH] rt-app: removed ftrace check trace-cmd seems to work fine with "ftrace: true" in the config, so removing the check that prevented both from being enabled. --- wlauto/workloads/rt_app/__init__.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/wlauto/workloads/rt_app/__init__.py b/wlauto/workloads/rt_app/__init__.py index 581bc84e..f7fa668d 100644 --- a/wlauto/workloads/rt_app/__init__.py +++ b/wlauto/workloads/rt_app/__init__.py @@ -247,12 +247,6 @@ class RtApp(Workload): def _update_rt_app_config(self, config_data): config_data['global'] = config_data.get('global', {}) - if 'ftrace' in config_data['global'] and instrument_is_enabled('trace-cmd'): - raise WorkloadError('trace-cmd instrument cannot be enabled ' - 'at the same time as ftrace rt-app setting. ' - 'Please disable trace-cmd instrument in your ' - 'WA config file or set ftrace to false in the ' - 'JSON file.') config_data['global']['logdir'] = self.device_working_directory config_data['global']['log_basename'] = self.log_basename if self.duration is not None: