Merge pull request #1114 from sosy-lab/task-definition-format-2.1

Add support for task definitions in format version 2.1

benchexec/model.py

@@ -44,7 +44,7 @@
 _EXPECTED_RESULT_FILTER_VALUES = {True: "true", False: "false", None: "unknown"}
 _WARNED_ABOUT_UNSUPPORTED_EXPECTED_RESULT_FILTER = False
 
-_TASK_DEF_VERSIONS = frozenset(["0.1", "1.0", "2.0"])
+_TASK_DEF_VERSIONS = frozenset(["0.1", "1.0", "2.0", "2.1"])
 
 
 def substitute_vars(oldList, runSet=None, task_file=None):
@@ -107,12 +107,18 @@ def load_task_definition_file(task_def_file):
             f"invalid format_version '{task_def.get('format_version')}'."
         )
 
-    if format_version != "2.0" and "options" in task_def:
+    if format_version not in ["2.0", "2.1"] and "options" in task_def:
         raise BenchExecException(
             f"Task-definition file {task_def_file} specifies invalid key 'options', "
             f"format_version needs to be at least 2.0 for this."
         )
 
+    if format_version != "2.1" and "additional_information" in task_def:
+        raise BenchExecException(
+            f"Task-definition file {task_def_file} specifies invalid key 'additional_information', "
+            f"format_version needs to be at least 2.1 for this."
+        )
+
     return task_def