diff options
| -rw-r--r-- | openmp/runtime/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | openmp/runtime/test/lit.cfg | 7 | ||||
| -rw-r--r-- | openmp/runtime/test/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | openmp/runtime/test/tasking/kmp_task_reduction_nest.cpp | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/openmp/runtime/test/CMakeLists.txt b/openmp/runtime/test/CMakeLists.txt index 88c02c873f4..a22a7d9b5d6 100644 --- a/openmp/runtime/test/CMakeLists.txt +++ b/openmp/runtime/test/CMakeLists.txt @@ -51,6 +51,8 @@ if(${LIBOMP_STANDALONE_BUILD}) endif() set(LIBOMP_TEST_COMPILER ${CMAKE_C_COMPILER} CACHE STRING "Compiler to use for testing OpenMP library") + set(LIBOMP_TEST_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE STRING + "Compiler to use for testing OpenMP library") set(LIBOMP_TEST_OPENMP_FLAG -fopenmp CACHE STRING "OpenMP compiler flag to use for testing OpenMP library") find_program(LIBOMP_LLVM_LIT_EXECUTABLE @@ -90,8 +92,10 @@ else() # LLVM source tree build, test just-built clang if(NOT MSVC) set(LIBOMP_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) + set(LIBOMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++) else() set(LIBOMP_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang.exe) + set(LIBOMP_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++.exe) endif() set(LIBOMP_TEST_OPENMP_FLAG -fopenmp=libomp) set(FILECHECK_EXECUTABLE ${LLVM_RUNTIME_OUTPUT_INTDIR}/FileCheck) diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index e9eeae8518c..328e32e0faf 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -30,7 +30,7 @@ def append_dynamic_library_path(path): config.name = 'libomp' # suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.c'] +config.suffixes = ['.c', '.cpp'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) @@ -99,9 +99,14 @@ if config.has_ompt: config.substitutions.append(("%libomp-compile-and-run", \ "%libomp-compile && %libomp-run")) +config.substitutions.append(("%libomp-cxx-compile-and-run", \ + "%libomp-cxx-compile && %libomp-run")) +config.substitutions.append(("%libomp-cxx-compile", \ + "%clangXX %cflags -std=c++11 %s -o %t" + libs)) config.substitutions.append(("%libomp-compile", \ "%clang %cflags %s -o %t" + libs)) config.substitutions.append(("%libomp-run", "%t")) +config.substitutions.append(("%clangXX", config.test_cxx_compiler)) config.substitutions.append(("%clang", config.test_compiler)) config.substitutions.append(("%openmp_flag", config.test_openmp_flag)) config.substitutions.append(("%cflags", config.test_cflags)) diff --git a/openmp/runtime/test/lit.site.cfg.in b/openmp/runtime/test/lit.site.cfg.in index b0d57ce2a7e..4ef828c28b6 100644 --- a/openmp/runtime/test/lit.site.cfg.in +++ b/openmp/runtime/test/lit.site.cfg.in @@ -1,6 +1,7 @@ @AUTO_GEN_COMMENT@ config.test_compiler = "@LIBOMP_TEST_COMPILER@" +config.test_cxx_compiler = "@LIBOMP_TEST_CXX_COMPILER@" config.test_filecheck = "@FILECHECK_EXECUTABLE@" config.test_openmp_flag = "@LIBOMP_TEST_OPENMP_FLAG@" config.test_extra_cflags = "@LIBOMP_TEST_CFLAGS@" diff --git a/openmp/runtime/test/tasking/kmp_task_reduction_nest.cpp b/openmp/runtime/test/tasking/kmp_task_reduction_nest.cpp index d54de594c5b..dcaabcf6e92 100644 --- a/openmp/runtime/test/tasking/kmp_task_reduction_nest.cpp +++ b/openmp/runtime/test/tasking/kmp_task_reduction_nest.cpp @@ -1,5 +1,5 @@ -// RUN: %libomp-compile-and-run -// RUN: %libomp-compile -DFLG=1 && %libomp-run +// RUN: %libomp-cxx-compile-and-run +// RUN: %libomp-cxx-compile -DFLG=1 && %libomp-run #include <cstdio> #include <cmath> #include <cassert> |
