Merge pull request diffblue#588 from diffblue/jd/feature/context_sensitive_rebuild

--rebuild should change function depending on context of run

Author: JohnDumbell

driver/run.py

@@ -517,15 +517,32 @@ def extract_wildcard_paths(path):
 
     if cmdline.rebuild:
         print("First performing cleanup.")
-        print("  Deleting " + cmdline.temp_dir)
-        if os.path.exists(cmdline.temp_dir):
-            shutil.rmtree(cmdline.temp_dir)
-        print("  Deleting " + cmdline.results_dir)
-        if os.path.exists(cmdline.results_dir):
-            shutil.rmtree(cmdline.results_dir)
-        print("  Deleting " + cmdline.common_dir)
-        if os.path.exists(cmdline.common_dir):
-            shutil.rmtree(cmdline.common_dir)
+
+        if cmdline.prepare_scan is not None:
+            if os.path.exists(cmdline.temp_dir):
+                print("  Deleting " + cmdline.temp_dir)
+                shutil.rmtree(cmdline.temp_dir)
+            if os.path.exists(cmdline.results_dir):
+                print("  Deleting " + cmdline.results_dir)
+                shutil.rmtree(cmdline.results_dir)
+            if os.path.exists(cmdline.common_dir):
+                print("  Deleting " + cmdline.common_dir)
+                shutil.rmtree(cmdline.common_dir)
+        elif cmdline.run_scan is not None:
+
+            # If we're running a scan, clear down all non-configuration files ready for a re-run.
+            entry_point_directories = []
+            if cmdline.run_scan == '':
+                entry_point_directories = [os.path.join(cmdline.results_dir, ep_folder) for ep_folder in os.listdir(cmdline.results_dir)]
+            else:
+                entry_point_directories.append(os.path.dirname(cmdline.run_scan))
+
+            # If the folder contains at least one of our command files, we can assume it's safe to delete from.
+            command_files = {"command_line.json", "config.json", "program.json"}
+            for deletable_folder in [os.path.join(folder, deletable_entry)
+                                     for folder in entry_point_directories if command_files.intersection(os.listdir(folder))
+                                     for deletable_entry in os.listdir(folder) if os.path.isdir(os.path.join(folder, deletable_entry))]:
+                shutil.rmtree(deletable_folder)
 
     if not os.path.exists(cmdline.results_dir):
         os.makedirs(cmdline.results_dir)