[Openmp-commits] [PATCH] D138411: Enable OMPD tests

[Vignesh Balasubramanian via Phabricator via Openmp-commits]

Vigneshbalu updated this revision to Diff 482698.
Vigneshbalu added a comment.

Checking the availability of GDB as well as it is required to run the tests.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D138411/new/

https://reviews.llvm.org/D138411

Files:
  openmp/CMakeLists.txt
  openmp/libompd/CMakeLists.txt
  openmp/libompd/test/CMakeLists.txt


Index: openmp/libompd/test/CMakeLists.txt
===================================================================
--- openmp/libompd/test/CMakeLists.txt
+++ openmp/libompd/test/CMakeLists.txt
@@ -6,31 +6,6 @@
   return()
 endif()
 
-find_package(LLVM REQUIRED CONFIG)
-list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
-include(AddLLVM)
-
-
-#find_program(LLVM_LIT_PATH
-#  NAMES llvm-lit lit
-#  HINTS ${LLVM_TOOLS_BINARY_DIR} 
-#  PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin
-#  DOC "llvm-lit executable. (Workaround for AddLLVM.cmake path not being set)"
-#)
-#if(LLVM_LIT_PATH)
-#  set(LLVM_EXTERNAL_LIT ${LLVM_LIT_PATH})
-#endif()
-
-#find_program(FILECHECK_EXECUTABLE
-#  NAMES Filecheck FileCheck
-#  HINTS ${LLVM_TOOLS_BINARY_DIR} 
-#  PATHS ${LLVM_ROOT_DIR}/bin /usr/bin /usr/local/bin /opt/local/bin
-#  DOC "Filecheck executable. (Workaround for AddLLVM.cmake path not being set)"
-#)
-#if(LLVM_FILECHECK_PATH)
-#  set(LLVM_EXTERNAL_FILECHECK ${LLVM_FILECHECK_PATH})
-#endif()
-
 set(PYTHON_PLUGIN ${ompd_BINARY_DIR}/gdb-plugin/python-module)
 
 # Configure the lit.site.cfg.in file
Index: openmp/libompd/CMakeLists.txt
===================================================================
--- openmp/libompd/CMakeLists.txt
+++ openmp/libompd/CMakeLists.txt
@@ -10,15 +10,17 @@
 
 find_package (Python3 COMPONENTS Interpreter Development)
 option(LIBOMP_OMPD_GDB_SUPPORT "Build gdb-plugin code that enables OMPD support in GDB." ${Python3_FOUND})
+find_program (GDB_FOUND NAMES "gdb")
+
 
 if(LIBOMP_OMPD_SUPPORT)
     set(OMPD_INCLUDE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/src/)
     add_subdirectory(src)
     if(LIBOMP_OMPD_GDB_SUPPORT)
         add_subdirectory(gdb-plugin)
-        # temporarily disabled
-        # test/CMakeLists.txt breaks DeviceRTL in LLVM_ENABLE_PROJECTS builds.
-        # find_package(LLVM) is likely the source of the trouble.
-        # add_subdirectory(test)
+		# GDB is required to run the tests
+		if (GDB_FOUND)
+	        add_subdirectory(test)
+		endif()
     endif()
 endif()
Index: openmp/CMakeLists.txt
===================================================================
--- openmp/CMakeLists.txt
+++ openmp/CMakeLists.txt
@@ -87,9 +87,6 @@
 # to enable time profiling support in the OpenMP runtime.
 add_subdirectory(runtime)
 
-# Build libompd.so
-add_subdirectory(libompd)
-
 if (OPENMP_ENABLE_LIBOMPTARGET)
   # Check that the library can actually be built.
   if (APPLE OR WIN32)
@@ -115,6 +112,9 @@
 
 option(OPENMP_MSVC_NAME_SCHEME "Build dll with MSVC naming scheme." OFF)
 
+# Build libompd.so
+add_subdirectory(libompd)
+
 # Build documentation
 add_subdirectory(docs)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D138411.482698.patch
Type: text/x-patch
Size: 2643 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20221214/1b31c062/attachment.bin>