Bugfix: Making tests end_to_end/prepare_scan/* to work.

This fix was done by JD on my machine.

Author: marek-trtik

regression/end_to_end/driver.py

@@ -105,12 +105,17 @@ def run_security_driver_script(
     cmdline = ["python3", pipeline_driver_path]
     cmdline.extend(extra_commandline)
 
-    executable_runner = ExecutableRunner(cmdline)
-    (stdout, stderr, ret) = executable_runner.run()
-    if ret != 0:
-        raise Exception(
-            "Failed running \"%s\":\nstdout:\n\n%s\nstderr\n\n%s" % \
-            (pretty_print_commandline(cmdline), stdout, stderr))
+    analyzer_home = utils.get_security_analyzer_home()
+    if analyzer_home is None:
+        raise Exception("Set SECURITY_SCANNER_HOME to a path containing the 'security-analyzer' binary")
+
+    with utils.working_dir(analyzer_home):
+        executable_runner = ExecutableRunner(cmdline)
+        (stdout, stderr, ret) = executable_runner.run()
+        if ret != 0:
+            raise Exception(
+                "Failed running \"%s\":\nstdout:\n\n%s\nstderr\n\n%s" % \
+                (pretty_print_commandline(cmdline), stdout, stderr))
 
 
 def run_security_analyser_pipeline(
@@ -125,9 +130,6 @@ def run_security_analyser_pipeline(
     if extra_args is None:
         extra_args = []
 
-    analyzer_home = utils.get_security_analyzer_home()
-    if analyzer_home is None:
-        raise Exception("Set SECURITY_SCANNER_HOME to a path containing the 'security-analyzer' binary")
     absolute_binary_path = \
         os.path.join(base_path, relative_binary_path)
     absolute_rules_path = \
@@ -158,8 +160,7 @@ def run_security_analyser_pipeline(
         # optimisation matches:
         cmdline.append("--verify-csvsa-sparse-domains")
 
-    with utils.working_dir(analyzer_home), \
-         utils.temp_dir_deleter(results_dir, keep_results), \
+    with utils.temp_dir_deleter(results_dir, keep_results), \
          utils.temp_dir_deleter(temporary_dir, keep_results), \
          utils.temp_dir_deleter(common_dir, keep_results):