[OMPT] Make tests require OMPT_BLAME

ompt_event_barrier_{begin,end} are optional blame events.
In total it doesn't make any sense to test partially built OMPT support.

llvm-svn: 264031

7 files changed, 6 insertions, 8 deletions

diff --git a/openmp/runtime/test/CMakeLists.txt b/openmp/runtime/test/CMakeLists.txt
index 3cbb3b75ddf..8b7ecfa4590 100644
--- a/openmp/runtime/test/CMakeLists.txt
+++ b/openmp/runtime/test/CMakeLists.txt
@@ -18,6 +18,7 @@ endmacro()
 
 pythonize_bool(LIBOMP_USE_HWLOC)
 pythonize_bool(LIBOMP_OMPT_SUPPORT)
+pythonize_bool(LIBOMP_OMPT_BLAME)
 pythonize_bool(LIBOMP_OMPT_TRACE)
 
 set(LIBOMP_TEST_CFLAGS "" CACHE STRING
diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg
index cf63e660920..98a13b0c48e 100644
--- a/openmp/runtime/test/lit.cfg
+++ b/openmp/runtime/test/lit.cfg
@@ -75,8 +75,6 @@ if config.has_ompt and config.test_filecheck == "":
 
 if config.has_ompt:
     config.available_features.add("ompt")
-    if config.has_ompt_trace:
-        config.available_features.add("ompt-trace")
     # for callback.h
     config.test_cflags += " -I " + config.test_source_root + "/ompt"
 
diff --git a/openmp/runtime/test/lit.site.cfg.in b/openmp/runtime/test/lit.site.cfg.in
index af30884d4b0..1b547f52d24 100644
--- a/openmp/runtime/test/lit.site.cfg.in
+++ b/openmp/runtime/test/lit.site.cfg.in
@@ -10,8 +10,7 @@ config.omp_header_directory = "@LIBOMP_BINARY_DIR@/src"
 config.operating_system = "@CMAKE_SYSTEM_NAME@"
 config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@"
 config.using_hwloc = @LIBOMP_USE_HWLOC@
-config.has_ompt = @LIBOMP_OMPT_SUPPORT@
-config.has_ompt_trace = @LIBOMP_OMPT_TRACE@
+config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_BLAME@ and @LIBOMP_OMPT_TRACE@
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg")
diff --git a/openmp/runtime/test/ompt/parallel/nested.c b/openmp/runtime/test/ompt/parallel/nested.c
index 3e25a06fc3c..11ebbd11061 100644
--- a/openmp/runtime/test/ompt/parallel/nested.c
+++ b/openmp/runtime/test/ompt/parallel/nested.c
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 #include <omp.h>
 
diff --git a/openmp/runtime/test/ompt/parallel/nested_serialized.c b/openmp/runtime/test/ompt/parallel/nested_serialized.c
index 4caa9fbc2e0..e678b48b425 100644
--- a/openmp/runtime/test/ompt/parallel/nested_serialized.c
+++ b/openmp/runtime/test/ompt/parallel/nested_serialized.c
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 #include <omp.h>
 
diff --git a/openmp/runtime/test/ompt/parallel/normal.c b/openmp/runtime/test/ompt/parallel/normal.c
index ca4af7eec62..887826f4e52 100644
--- a/openmp/runtime/test/ompt/parallel/normal.c
+++ b/openmp/runtime/test/ompt/parallel/normal.c
@@ -1,6 +1,6 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
 // RUN: %libomp-compile-and-run | %sort-threads | FileCheck --check-prefix=THREADS %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 
 int main()
diff --git a/openmp/runtime/test/ompt/parallel/serialized.c b/openmp/runtime/test/ompt/parallel/serialized.c
index 6338e00e90a..31d1b42c04c 100644
--- a/openmp/runtime/test/ompt/parallel/serialized.c
+++ b/openmp/runtime/test/ompt/parallel/serialized.c
@@ -1,5 +1,5 @@
 // RUN: %libomp-compile-and-run | FileCheck %s
-// REQUIRES: ompt, ompt-trace
+// REQUIRES: ompt
 #include "callback.h"
 
 int main()