Update task definitions of combinations to v2.0

c/combinations/generate-tasks.py

@@ -5,6 +5,7 @@
 # https://gitlab.com/sosy-lab/research/data/difference-data
 #
 # SPDX-FileCopyrightText: 2020 Dirk Beyer <https://sosy-lab.org>
+# SPDX-FileCopyrightText: 2020 The SV-Benchmarks Community
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -98,18 +99,20 @@ def _create_combo(
     )
 
 
-def _get_yml_content(verdict1, verdict2, input_file: str):
+def _get_yml_content(verdict1, verdict2, input_file: str, data_model="ILP32"):
     verdict = verdict1 == verdict2 == True
-    return """format_version: '1.0'
+    return f"""format_version: '2.0'
 
-input_files: '%s'
+input_files: '{input_file}'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: %s""" % (
-        input_file,
-        verdict,
-    )
+    expected_verdict: {verdict}
+
+options:
+  language: C
+  data_model: {data_model}
+"""
 
 
 def create_combos(

c/combinations/pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label01.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label01.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label02.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label02.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label04.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label04.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label05.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label05.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label09.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.BOUNDED-6.pals+Problem12_label09.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label01.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label01.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label02.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label02.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label04.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label04.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label05.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label05.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label09.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.1.ufo.UNBOUNDED.pals+Problem12_label09.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label00.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label00.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label01.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label01.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label02.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label02.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label03.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label03.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label04.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label04.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label05.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label05.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label06.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label06.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label07.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label07.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label08.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label08.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label09.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.BOUNDED-6.pals+Problem12_label09.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label00.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label00.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label01.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label01.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label02.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label02.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: True
+    expected_verdict: True
+
+options:
+  language: C
+  data_model: ILP32

c/combinations/pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label03.yml

@@ -1,7 +1,11 @@
-format_version: '1.0'
+format_version: '2.0'
 
 input_files: 'pals_lcr.3.ufo.UNBOUNDED.pals+Problem12_label03.c'
 
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: False
+    expected_verdict: False
+
+options:
+  language: C
+  data_model: ILP32