commit e41cde57c357e40024ade4efdec04dbc4b302b2a
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Oct 03 18:36:09 2024 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Oct 03 18:36:09 2024 +0200
tree 6abe21347117beaa7c2a4097445c6794aae4327e
parent 005dca6ad8d1292d53d2fc8b5cff0a8bfc0c0edf

Pass KNOWN_TASKS as an argument to main

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

tests/scripts/analyze_outcomes.py

diff --git a/tests/scripts/analyze_outcomes.py b/tests/scripts/analyze_outcomes.py
index f681a30..8dd8f59 100755
--- a/tests/scripts/analyze_outcomes.py
+++ b/tests/scripts/analyze_outcomes.py
@@ -761,7 +761,7 @@
     'analyze_block_cipher_dispatch': DriverVSReference_block_cipher_dispatch,
 }
 
-def main() -> None:
+def main(known_tasks: typing.Dict[str, typing.Type[Task]]) -> None:
     main_results = Results()
 
     try:
@@ -783,16 +783,16 @@
         options = parser.parse_args()
 
         if options.list:
-            for task_name in KNOWN_TASKS:
+            for task_name in known_tasks:
                 print(task_name)
             sys.exit(0)
 
         if options.specified_tasks == 'all':
-            tasks_list = list(KNOWN_TASKS.keys())
+            tasks_list = list(known_tasks.keys())
         else:
             tasks_list = re.split(r'[, ]+', options.specified_tasks)
             for task_name in tasks_list:
-                if task_name not in KNOWN_TASKS:
+                if task_name not in known_tasks:
                     sys.stderr.write('invalid task: {}\n'.format(task_name))
                     sys.exit(2)
 
@@ -805,7 +805,7 @@
                 sys.exit(2)
 
             task_name = tasks_list[0]
-            task_class = KNOWN_TASKS[task_name]
+            task_class = known_tasks[task_name]
             if not issubclass(task_class, DriverVSReference):
                 sys.stderr.write("please provide valid outcomes file for {}.\n".format(task_name))
                 sys.exit(2)
@@ -824,7 +824,7 @@
         outcomes = read_outcome_file(options.outcomes)
 
         for task_name in tasks_list:
-            task_constructor = KNOWN_TASKS[task_name]
+            task_constructor = known_tasks[task_name]
             task_instance = task_constructor(options)
             main_results.new_section(task_instance.section_name())
             task_instance.run(main_results, outcomes)
@@ -840,4 +840,4 @@
         sys.exit(120)
 
 if __name__ == '__main__':
-    main()
+    main(KNOWN_TASKS)