From 566b14ecaf73cb8f2bfd960558787637cd922bed375026e860ed3801c315cf81 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 20 May 2021 10:17:17 +0000 Subject: [PATCH] add test fixes OBS-URL: https://build.opensuse.org/package/show/devel:tools:statica/klee?expand=0&rev=100 --- 0001-test-disable-until-it-is-fixed.patch | 23 ++++++++++++++++ ...it-add-12-to-supported-LLVM-versions.patch | 27 +++++++++++++++++++ klee.spec | 2 ++ 3 files changed, 52 insertions(+) create mode 100644 0001-test-disable-until-it-is-fixed.patch create mode 100644 0001-test-lit-add-12-to-supported-LLVM-versions.patch diff --git a/0001-test-disable-until-it-is-fixed.patch b/0001-test-disable-until-it-is-fixed.patch new file mode 100644 index 0000000..1b26463 --- /dev/null +++ b/0001-test-disable-until-it-is-fixed.patch @@ -0,0 +1,23 @@ +From: Jiri Slaby +Date: Thu, 20 May 2021 12:16:09 +0200 +Subject: test: disable until it is fixed +Patch-mainline: no +References: LLVM 12 + +Signed-off-by: Jiri Slaby +--- + .../Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/Runtime/Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c b/test/Runtime/Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c +index 95b94e41..c274b214 100644 +--- a/test/Runtime/Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c ++++ b/test/Runtime/Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c +@@ -1,3 +1,4 @@ ++// REQUIRES: lt-llvm-12.0 + // RUN: %clang %s -emit-llvm %O0opt -c -o %t1.bc + // RUN: rm -rf %t.klee-out + // RUN: %klee --output-dir=%t.klee-out --exit-on-error --optimize --libc=uclibc %t1.bc +-- +2.26.2 + diff --git a/0001-test-lit-add-12-to-supported-LLVM-versions.patch b/0001-test-lit-add-12-to-supported-LLVM-versions.patch new file mode 100644 index 0000000..b7190d5 --- /dev/null +++ b/0001-test-lit-add-12-to-supported-LLVM-versions.patch @@ -0,0 +1,27 @@ +From: Jiri Slaby +Date: Thu, 20 May 2021 12:03:08 +0200 +Subject: test/lit: add 12 to supported LLVM versions +Patch-mainline: no +References: LLVM 12 + +Signed-off-by: Jiri Slaby +--- + test/lit.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/lit.cfg b/test/lit.cfg +index a195a1dc..1a119f9e 100644 +--- a/test/lit.cfg ++++ b/test/lit.cfg +@@ -157,7 +157,7 @@ config.substitutions.append( + + # Add feature for the LLVM version in use, so it can be tested in REQUIRES and + # XFAIL checks. We also add "not-XXX" variants, for the same reason. +-known_llvm_versions = set(["3.8", "3.9", "4.0", "5.0", "6.0", "7.0", "7.1", "8.0", "9.0", "10.0", "11.0", "11.1"]) ++known_llvm_versions = set(["3.8", "3.9", "4.0", "5.0", "6.0", "7.0", "7.1", "8.0", "9.0", "10.0", "11.0", "11.1", "12.0"]) + current_llvm_version_tuple = (int(config.llvm_version_major), int(config.llvm_version_minor)) + current_llvm_version = "%s.%s" % current_llvm_version_tuple + +-- +2.26.2 + diff --git a/klee.spec b/klee.spec index a56a5ae..b0ce8f4 100644 --- a/klee.spec +++ b/klee.spec @@ -38,6 +38,8 @@ Source0: %{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc Source2: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version_major}.0.0/llvm/utils/not/not.cpp Source3: https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-%{llvm_version_major}.0.0/llvm/utils/FileCheck/FileCheck.cpp +Patch0: 0001-test-lit-add-12-to-supported-LLVM-versions.patch +Patch1: 0001-test-disable-until-it-is-fixed.patch BuildRequires: clang%{llvm_version} BuildRequires: cmake BuildRequires: gperftools-devel