[Openmp-commits] [openmp] r354572 - [OpenMP] Fix check-openmp after r354553

[Jonas Hahnfeld via Openmp-commits]

Author: hahnfeld
Date: Thu Feb 21 04:00:57 2019
New Revision: 354572

URL: http://llvm.org/viewvc/llvm-project?rev=354572&view=rev
Log:
[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.)

Modified:
    openmp/trunk/runtime/test/CMakeLists.txt

Modified: openmp/trunk/runtime/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/test/CMakeLists.txt?rev=354572&r1=354571&r2=354572&view=diff
==============================================================================
--- openmp/trunk/runtime/test/CMakeLists.txt (original)
+++ openmp/trunk/runtime/test/CMakeLists.txt Thu Feb 21 04:00:57 2019
@@ -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