[analyzer][tests] Fix SATest update functionality

[vsavchenko]

Summary

Not all projects in the project map file might have newer results
for updating, we should handle this situation gracefully.

Additionally, not every user of the test system would want storing
reference results in git. For this reason, git functionality is now
optional.

[NoQ]

We absolutely needed this :)

clang/utils/analyzer/SATest.py

 
 
 def update(parser, args):
     import SATestUpdateDiffs
     from ProjectMap import ProjectMap
 
     project_map = ProjectMap()
     for project in project_map.projects:
-        SATestUpdateDiffs.update_reference_results(project)
+        SATestUpdateDiffs.update_reference_results(project, args.git)
 
 
 def benchmark(parser, args):
     from SATestBenchmark import Benchmark
 
     projects = get_projects(parser, args.projects)
     benchmark = Benchmark(projects, args.iterations, args.output)
     benchmark.run()
def main():
     cmp_parser.add_argument("new", nargs=1, help="Directory with new results")
     cmp_parser.set_defaults(func=compare)
 
     # update subcommand
     upd_parser = subparsers.add_parser(
         "update",
         help="Update static analyzer reference results based on the previous "
         "run of SATest build. Assumes that SATest build was just run.")
-    # TODO: add option to decide whether we should use git
+    upd_parser.add_argument("--git", action="store_true",
+                            help="Stage updated results using git.")
     upd_parser.set_defaults(func=update)
 
     # docker subcommand
     dock_parser = subparsers.add_parser(
         "docker",
         help="Run regression system in the docker.")
 
     dock_parser.add_argument("--build-image", action="store_true",

clang/utils/analyzer/SATestUpdateDiffs.py

 import shutil
 import sys
 
 from subprocess import check_call
 
 Verbose = 0
 
 
-def update_reference_results(project: ProjectInfo):
+def update_reference_results(project: ProjectInfo, git: bool = False):
     test_info = SATestBuild.TestInfo(project)
     tester = SATestBuild.ProjectTester(test_info)
     project_dir = tester.get_project_dir()
 
     tester.is_reference_build = True
     ref_results_path = tester.get_output_dir()
 
     tester.is_reference_build = False
     created_results_path = tester.get_output_dir()
 
     if not os.path.exists(created_results_path):
-        print("New results not found, was SATestBuild.py previously run?",
+        print(f"Skipping project '{project.name}', "
+              f"it doesn't have newer results.",
               file=sys.stderr)
-        sys.exit(1)
+        return
 
     build_log_path = SATestBuild.get_build_log_path(ref_results_path)
     build_log_dir = os.path.dirname(os.path.abspath(build_log_path))
 
     os.makedirs(build_log_dir)
 
     with open(build_log_path, "w+") as build_log_file:
         def run_cmd(command: str):
             if Verbose:
                 print(f"Executing {command}")
             check_call(command, shell=True, stdout=build_log_file)
 
         # Remove reference results: in git, and then again for a good measure
         # with rm, as git might not remove things fully if there are empty
         # directories involved.
+        if git:
             run_cmd(f"git rm -r -q '{ref_results_path}'")
         shutil.rmtree(ref_results_path)
 
         # Replace reference results with a freshly computed once.
         shutil.copytree(created_results_path, ref_results_path, symlinks=True)
 
         # Run cleanup script.
         SATestBuild.run_cleanup_script(project_dir, build_log_file)
 
         SATestBuild.normalize_reference_results(
             project_dir, ref_results_path, project.mode)
 
         # Clean up the generated difference results.
         SATestBuild.cleanup_reference_results(ref_results_path)
 
+        if git:
             run_cmd(f"git add '{ref_results_path}'")
 
 
-# TODO: use argparse
-def main(argv):
-    if len(argv) == 2 and argv[1] in ("-h", "--help"):
-        print("Update static analyzer reference results based "
-              "\non the previous run of SATestBuild.py.\n"
-              "\nN.B.: Assumes that SATestBuild.py was just run",
-              file=sys.stderr)
-        sys.exit(1)
-
-    project_map = ProjectMap()
-    for project in project_map.projects:
-        update_reference_results(project)
-
-
-if __name__ == '__main__':
-    main(sys.argv)
+if __name__ == "__main__":
+    print("SATestUpdateDiffs.py should not be used on its own.")
+    print("Please use 'SATest.py update' instead")