diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | test/Concrete/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | test/lit.cfg | 3 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 4 | ||||
| -rw-r--r-- | test/regression/2018-10-30-llvm-pr39177.ll | 1 |
5 files changed, 6 insertions, 21 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2a968333..a62347c1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -75,11 +75,7 @@ endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${KLEE_TOOLS_DIR}/testtools) if (DOWNLOAD_FILECHECK_SOURCE) - if (${LLVM_VERSION_MAJOR} GREATER 3) - set(FILECHECK_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.x/llvm/utils/FileCheck/FileCheck.cpp") - else() - set(FILECHECK_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.x/llvm/utils/FileCheck/FileCheck.cpp") - endif() + set(FILECHECK_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.x/llvm/utils/FileCheck/FileCheck.cpp") set(FILECHECK_SRC_FILE "${CMAKE_CURRENT_BINARY_DIR}/FileCheck.cpp") if (NOT EXISTS "${FILECHECK_SRC_FILE}") message(STATUS "Downloading LLVM FileCheck source") @@ -102,11 +98,7 @@ if (DOWNLOAD_FILECHECK_SOURCE) endif() if (DOWNLOAD_NOT_SOURCE) - if (${LLVM_VERSION_MAJOR} GREATER 3) - set(NOT_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.x/llvm/utils/not/not.cpp") - else() - set(NOT_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.x/llvm/utils/not/not.cpp") - endif() + set(NOT_SRC_URL "https://raw.githubusercontent.com/llvm/llvm-project/release/${LLVM_VERSION_MAJOR}.x/llvm/utils/not/not.cpp") set(NOT_SRC_FILE "${CMAKE_CURRENT_BINARY_DIR}/not.cpp") if (NOT EXISTS "${NOT_SRC_FILE}") message(STATUS "Downloading LLVM not source") diff --git a/test/Concrete/CMakeLists.txt b/test/Concrete/CMakeLists.txt index 0f565bed..e7cf2416 100644 --- a/test/Concrete/CMakeLists.txt +++ b/test/Concrete/CMakeLists.txt @@ -6,9 +6,6 @@ # License. See LICENSE.TXT for details. # #===------------------------------------------------------------------------===# -if (${LLVM_VERSION_MAJOR} GREATER 4) - set(OZERO_OPT "-O0 -Xclang -disable-O0-optnone") -else() - set(OZERO_OPT "-O0") -endif() + +set(OZERO_OPT "-O0 -Xclang -disable-O0-optnone") configure_file(Makefile.cmake.test.in Makefile.cmake.test @ONLY) diff --git a/test/lit.cfg b/test/lit.cfg index 60bcb781..0d7aa1ed 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -157,8 +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 = { "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", "13.0" } +known_llvm_versions = { "6.0", "7.0", "7.1", "8.0", "9.0", "10.0", "11.0", "11.1", "12.0", "13.0" } current_llvm_version_tuple = (int(config.llvm_version_major), int(config.llvm_version_minor)) current_llvm_version = "%s.%s" % current_llvm_version_tuple diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index e5fe3d89..849062b1 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -24,9 +24,7 @@ config.cxx = "@NATIVE_CXX@" # NOTE: any changes to compiler flags also have to be applied to # test/Concrete/CMakeLists.txt -config.O0opt = "-O0" -if @LLVM_VERSION_MAJOR@ >= 5: - config.O0opt += " -Xclang -disable-O0-optnone" +config.O0opt = "-O0 -Xclang -disable-O0-optnone" # Features config.enable_uclibc = True if @SUPPORT_KLEE_UCLIBC@ == 1 else False diff --git a/test/regression/2018-10-30-llvm-pr39177.ll b/test/regression/2018-10-30-llvm-pr39177.ll index 0b300c81..601a37bd 100644 --- a/test/regression/2018-10-30-llvm-pr39177.ll +++ b/test/regression/2018-10-30-llvm-pr39177.ll @@ -1,4 +1,3 @@ -; REQUIRES: geq-llvm-3.9 ; RUN: rm -rf %t.klee-out ; RUN: llvm-as -f %s -o - | %klee -optimize -output-dir=%t.klee-out | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" |