Merge pull request #1202 from lembergerth/xcsp-verdict-fixes

Fix expected verdicts of XCSP (swapped), improve recreation

Author: dbeyer

.reuse/dep5

@@ -142,7 +142,6 @@ Files:
  c/termination-restricted-15-todo
  c/uthash-2.0.2
  c/verifythis
- c/xcsp
  java/MinePump
  java/algorithms
  java/java-ranger-regression

c/xcsp/LICENSE renamed to LICENSES/MIT.txt

@@ -1,8 +1,7 @@
-Copyright (c) 2020 Dirk Beyer
-Copyright (c) 2016 Gilles Audemard
+Copyright <YEAR> <COPYRIGHT HOLDER>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

c/check.py

@@ -137,7 +137,9 @@
     ("aws-c-common", "unexpected file makeall"),
     ("aws-c-common", "unexpected file Makefile.sv-benchmarks"),
     ("aws-c-common", "unexpected file yml.sh"),
-    ("xcsp", "unexpected file create_from_xmls.py")
+    ("xcsp", "unexpected file create_from_xmls.py"),
+    ("xcsp", "unexpected file xcsp3_cpp_parser"),
+    ("xcsp", "unexpected file xcsp3_cpp_parser.license"),
     ]
 
 KNOWN_BENCHMARK_FILE_PROBLEMS = [

c/xcsp/AllInterval-005.c

@@ -1,8 +1,21 @@
+// This file is part of the SV-Benchmarks collection of verification tasks:
+// https://github.com/sosy-lab/sv-benchmarks
+//
+// SPDX-FileCopyrightText: 2016 Gilles Audemard
+// SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+// SPDX-FileCopyrightText: 2020 The SV-Benchmarks Community
+//
+// SPDX-License-Identifier: MIT
+
 extern void abort(void) __attribute__((__nothrow__, __leaf__))
 __attribute__((__noreturn__));
+extern void __assert_fail(const char *, const char *, unsigned int,
+                          const char *) __attribute__((__nothrow__, __leaf__))
+__attribute__((__noreturn__));
 int __VERIFIER_nondet_int();
-extern void __assert_fail(const char *, const char *, unsigned int, const char *) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__noreturn__));
-void reach_error() { __assert_fail("0", "AllInterval-005.c", 5, "reach_error"); }
+void reach_error() {
+  __assert_fail("0", "AllInterval-005.c", 5, "reach_error");
+}
 void assume(int cond) {
   if (!cond)
     abort();

c/xcsp/AllInterval-005.yml

@@ -3,7 +3,7 @@ format_version: '2.0'
 input_files: 'AllInterval-005.c'
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: true
+    expected_verdict: false
 
 options:
   language: C

c/xcsp/AllInterval-006.c

@@ -1,8 +1,21 @@
+// This file is part of the SV-Benchmarks collection of verification tasks:
+// https://github.com/sosy-lab/sv-benchmarks
+//
+// SPDX-FileCopyrightText: 2016 Gilles Audemard
+// SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+// SPDX-FileCopyrightText: 2020 The SV-Benchmarks Community
+//
+// SPDX-License-Identifier: MIT
+
 extern void abort(void) __attribute__((__nothrow__, __leaf__))
 __attribute__((__noreturn__));
+extern void __assert_fail(const char *, const char *, unsigned int,
+                          const char *) __attribute__((__nothrow__, __leaf__))
+__attribute__((__noreturn__));
 int __VERIFIER_nondet_int();
-extern void __assert_fail(const char *, const char *, unsigned int, const char *) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__noreturn__));
-void reach_error() { __assert_fail("0", "AllInterval-006.c", 5, "reach_error"); }
+void reach_error() {
+  __assert_fail("0", "AllInterval-006.c", 5, "reach_error");
+}
 void assume(int cond) {
   if (!cond)
     abort();

c/xcsp/AllInterval-006.yml

@@ -3,7 +3,7 @@ format_version: '2.0'
 input_files: 'AllInterval-006.c'
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: true
+    expected_verdict: false
 
 options:
   language: C

c/xcsp/AllInterval-007.c

@@ -1,8 +1,21 @@
+// This file is part of the SV-Benchmarks collection of verification tasks:
+// https://github.com/sosy-lab/sv-benchmarks
+//
+// SPDX-FileCopyrightText: 2016 Gilles Audemard
+// SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+// SPDX-FileCopyrightText: 2020 The SV-Benchmarks Community
+//
+// SPDX-License-Identifier: MIT
+
 extern void abort(void) __attribute__((__nothrow__, __leaf__))
 __attribute__((__noreturn__));
+extern void __assert_fail(const char *, const char *, unsigned int,
+                          const char *) __attribute__((__nothrow__, __leaf__))
+__attribute__((__noreturn__));
 int __VERIFIER_nondet_int();
-extern void __assert_fail(const char *, const char *, unsigned int, const char *) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__noreturn__));
-void reach_error() { __assert_fail("0", "AllInterval-007.c", 5, "reach_error"); }
+void reach_error() {
+  __assert_fail("0", "AllInterval-007.c", 5, "reach_error");
+}
 void assume(int cond) {
   if (!cond)
     abort();

c/xcsp/AllInterval-007.yml

@@ -3,7 +3,7 @@ format_version: '2.0'
 input_files: 'AllInterval-007.c'
 properties:
   - property_file: ../properties/unreach-call.prp
-    expected_verdict: true
+    expected_verdict: false
 
 options:
   language: C

c/xcsp/AllInterval-008.c

@@ -1,8 +1,21 @@
+// This file is part of the SV-Benchmarks collection of verification tasks:
+// https://github.com/sosy-lab/sv-benchmarks
+//
+// SPDX-FileCopyrightText: 2016 Gilles Audemard
+// SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
+// SPDX-FileCopyrightText: 2020 The SV-Benchmarks Community
+//
+// SPDX-License-Identifier: MIT
+
 extern void abort(void) __attribute__((__nothrow__, __leaf__))
 __attribute__((__noreturn__));
+extern void __assert_fail(const char *, const char *, unsigned int,
+                          const char *) __attribute__((__nothrow__, __leaf__))
+__attribute__((__noreturn__));
 int __VERIFIER_nondet_int();
-extern void __assert_fail(const char *, const char *, unsigned int, const char *) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__noreturn__));
-void reach_error() { __assert_fail("0", "AllInterval-008.c", 5, "reach_error"); }
+void reach_error() {
+  __assert_fail("0", "AllInterval-008.c", 5, "reach_error");
+}
 void assume(int cond) {
   if (!cond)
     abort();