Merge pull request diffblue#277 from diffblue/marek/extended_meaning_of_env_vars

Extended meaning of SECURITY_ANALYSER_END_TO_END_TESTS_KEEP_RESULTS and introducing SECURITY_SCANNER_EXTRA_OPTIONS

Author: smowton

regression/end_to_end/driver.py

@@ -4,7 +4,7 @@
 import tempfile
 import shutil
 import contextlib
-import sys
+
 
 from regression.executable_runner import ExecutableRunner
 
@@ -56,7 +56,10 @@ def run_security_analyser_pipeline(
     relative_binary_path,
     relative_rules_path,
     base_path,
-    extra_args = []):
+    extra_args=None):
+
+    if extra_args is None:
+        extra_args = []
 
     regression_tests_path = os.getcwd()
     analyzer_home = get_security_analyzer_home()
@@ -69,8 +72,10 @@ def run_security_analyser_pipeline(
     absolute_rules_path = \
         os.path.join(base_path, relative_rules_path)
 
-    results_dir = tempfile.mkdtemp()
-    temporary_dir = tempfile.mkdtemp()
+    results_dir = os.path.join(os.environ["SECURITY_ANALYSER_END_TO_END_TESTS_KEEP_RESULTS"], "RESULTS")\
+                  if "SECURITY_ANALYSER_END_TO_END_TESTS_KEEP_RESULTS" in os.environ else tempfile.mkdtemp()
+    temporary_dir = os.path.join(os.environ["SECURITY_ANALYSER_END_TO_END_TESTS_KEEP_RESULTS"], "TEMP")\
+                  if "SECURITY_ANALYSER_END_TO_END_TESTS_KEEP_RESULTS" in os.environ else tempfile.mkdtemp()
 
     cmdline = ["python", pipeline_driver_path,
                "-C", absolute_rules_path,