summaryrefslogtreecommitdiffstats
path: root/openmp
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2019-02-21 12:00:57 +0000
committerJonas Hahnfeld <hahnjo@hahnjo.de>2019-02-21 12:00:57 +0000
commitdb3025ad57f1b10b745ed8d5499077972cf91f67 (patch)
tree5873c0b7569cce9bb3eedcfc01dd9b48d21727dc /openmp
parent8443e88910e12ad6cbf55a92b36b038ffb3746f3 (diff)
downloadbcm5719-llvm-db3025ad57f1b10b745ed8d5499077972cf91f67.tar.gz
bcm5719-llvm-db3025ad57f1b10b745ed8d5499077972cf91f67.zip
[OpenMP] Fix check-openmp after r354553
Calling add_openmp_testsuite will add the tests to check-openmp unless EXCLUDE_FROM_ALL is set. This is problematic because the tests for OMPT will be included twice which doesn't work if the same test is executed concurrently by multiple threads. See: http://lab.llvm.org:8011/builders/openmp-gcc-x86_64-linux-debian/builds/163 http://lab.llvm.org:8011/builders/openmp-clang-x86_64-linux-debian/builds/184 http://lab.llvm.org:8011/builders/openmp-clang-ppc64le-linux-rhel/builds/133 (On PPC some failures are unrelated to r354553, the bot has been red before and this commit is not expected to fix that. For a proper patch please see https://reviews.llvm.org/D56286.) llvm-svn: 354572
Diffstat (limited to 'openmp')
-rw-r--r--openmp/runtime/test/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/openmp/runtime/test/CMakeLists.txt b/openmp/runtime/test/CMakeLists.txt
index 0cee793554c..851377f735c 100644
--- a/openmp/runtime/test/CMakeLists.txt
+++ b/openmp/runtime/test/CMakeLists.txt
@@ -31,6 +31,8 @@ pythonize_bool(LIBOMP_HAVE_LIBM)
pythonize_bool(LIBOMP_HAVE_LIBATOMIC)
add_openmp_testsuite(check-libomp "Running libomp tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS omp)
+# Add target check-ompt, but make sure to not add the tests twice to check-openmp.
+set(EXCLUDE_FROM_ALL True)
add_openmp_testsuite(check-ompt "Running OMPT tests" ${CMAKE_CURRENT_BINARY_DIR}/ompt DEPENDS omp)
# Configure the lit.site.cfg.in file
OpenPOWER on IntegriCloud