Added %results% placeholder for logging and profiling end-to-end test configuration (#4980)

Author: joachimmetz

tests/end-to-end.py

@@ -69,6 +69,34 @@ def __init__(
     self._test_sources_path = test_sources_path
     self._tools_path = tools_path
 
+  def _GetLoggingOptions(self, command, logging_options):
+    """Determines the logging options.
+
+    Args:
+      command (str): command the logging options are for.
+      logging_options (list[str]): logging options from the test definition.
+
+    Returns:
+      [str]: logging options.
+    """
+    return [
+        option.replace('%command%', command).replace(
+            '%results%', self._test_results_path)
+        for option in logging_options]
+
+  def _GetProfilinggOptions(self, profiling_options):
+    """Determines the profiling options.
+
+    Args:
+      profiling_options (list[str]): profiling options from the test definition.
+
+    Returns:
+      [str]: profiling options.
+    """
+    return [
+        option.replace('%results%', self._test_results_path)
+        for option in profiling_options]
+
   def _RunCommand(self, command, stdout=None, stderr=None):
     """Runs a command.
 
@@ -632,9 +660,10 @@ def _RunPsort(
     if output_filter:
       output_options.append(output_filter)
 
-    logging_options = [
-        option.replace('%command%', 'psort')
-        for option in test_definition.logging_options]
+    logging_options = self._GetLoggingOptions(
+        'psort', test_definition.logging_options)
+    profiling_options = self._GetProfilinggOptions(
+        test_definition.profiling_options)
 
     stdout_file = os.path.join(
         temp_directory, '{0:s}-psort.out'.format(test_definition.name))
@@ -646,7 +675,7 @@ def _RunPsort(
     command.extend(output_options)
     command.extend(logging_options)
     command.extend(['--status-view', 'none', '--unattended'])
-    command.extend(test_definition.profiling_options)
+    command.extend(profiling_options)
 
     with open(stdout_file, 'w', encoding='utf-8') as stdout:
       with open(stderr_file, 'w', encoding='utf-8') as stderr:
@@ -758,18 +787,20 @@ def _RunLog2Timeline(
             self._test_sources_path, yara_rules_path)
       extract_options.extend(['--yara-rules', yara_rules_path])
 
-    logging_options = [
-        option.replace('%command%', 'log2timeline')
-        for option in test_definition.logging_options]
+    logging_options = self._GetLoggingOptions(
+        'log2timeline', test_definition.logging_options)
+    profiling_options = self._GetProfilinggOptions(
+        test_definition.profiling_options)
 
     stdout_file = os.path.join(
         temp_directory, '{0:s}-log2timeline.out'.format(test_definition.name))
     stderr_file = os.path.join(
         temp_directory, '{0:s}-log2timeline.err'.format(test_definition.name))
+
     command = [self._log2timeline_path]
     command.extend(extract_options)
     command.extend(logging_options)
-    command.extend(test_definition.profiling_options)
+    command.extend(profiling_options)
     command.extend(['--storage-file', storage_file, source_path])
 
     with open(stdout_file, 'w', encoding='utf-8') as stdout:
@@ -972,9 +1003,10 @@ def _RunPsteal(
           temp_directory, test_definition.output_file)
     psteal_options.extend(['-w', output_file_path])
 
-    logging_options = [
-        option.replace('%command%', 'psteal')
-        for option in test_definition.logging_options]
+    logging_options = self._GetLoggingOptions(
+        'psteal', test_definition.logging_options)
+    profiling_options = self._GetProfilinggOptions(
+        test_definition.profiling_options)
 
     stdout_file = os.path.join(
         temp_directory, '{0:s}-psteal.out'.format(test_definition.name))
@@ -986,7 +1018,7 @@ def _RunPsteal(
     command.extend(logging_options)
     command.extend(output_options)
     command.extend(['--status-view', 'none', '--unattended'])
-    command.extend(test_definition.profiling_options)
+    command.extend(profiling_options)
 
     with open(stdout_file, 'w', encoding='utf-8') as stdout:
       with open(stderr_file, 'w', encoding='utf-8') as stderr:
@@ -1451,9 +1483,10 @@ def _RunImageExport(self, test_definition, temp_directory, source_path):
 
     output_options = ['-w', exported_files_path]
 
-    logging_options = [
-        option.replace('%command%', 'image_export')
-        for option in test_definition.logging_options]
+    logging_options = self._GetLoggingOptions(
+        'image_export', test_definition.logging_options)
+    profiling_options = self._GetProfilinggOptions(
+        test_definition.profiling_options)
 
     stdout_file = os.path.join(
         temp_directory, '{0:s}-image_export.out'.format(test_definition.name))
@@ -1464,7 +1497,7 @@ def _RunImageExport(self, test_definition, temp_directory, source_path):
     command.extend(export_options)
     command.extend(output_options)
     command.extend(logging_options)
-    command.extend(test_definition.profiling_options)
+    command.extend(profiling_options)
     command.append(source_path)
 
     with open(stdout_file, 'w', encoding='utf-8') as stdout: