[Openmp-commits] [PATCH] D137831: Fix Configuration and test failures due to libompd test

[Vignesh Balasubramanian via Phabricator via Openmp-commits]

Vigneshbalu created this revision.
Herald added a project: All.
Vigneshbalu requested review of this revision.
Herald added a project: OpenMP.
Herald added a subscriber: openmp-commits.

Follow up patch to commit: https://github.com/llvm/llvm-project/commit/1099498e3f35b2ad4b021ba3888b590259124e74

Test failures are not reproducible on local machine so disabling until analysis can be done.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D137831

Files:
  openmp/libompd/test/CMakeLists.txt
  openmp/libompd/test/openmp_examples/ompd_bt.c
  openmp/libompd/test/openmp_examples/ompd_parallel.c


Index: openmp/libompd/test/openmp_examples/ompd_parallel.c
===================================================================
--- openmp/libompd/test/openmp_examples/ompd_parallel.c
+++ openmp/libompd/test/openmp_examples/ompd_parallel.c
@@ -1,6 +1,8 @@
 // RUN: %gdb-compile 2>&1 | tee %t.compile
 // RUN: %gdb-test -x %S/ompd_parallel.cmd %t 2>&1 | tee %t.out | FileCheck %s
 
+// REQUIRES: determinism
+
 #include <omp.h>
 #include <stdio.h>
 
Index: openmp/libompd/test/openmp_examples/ompd_bt.c
===================================================================
--- openmp/libompd/test/openmp_examples/ompd_bt.c
+++ openmp/libompd/test/openmp_examples/ompd_bt.c
@@ -1,6 +1,8 @@
 // RUN: %gdb-compile 2>&1 | tee %t.compile
 // RUN: %gdb-test -x %S/ompd_bt.cmd %t 2>&1 | tee %t.out | FileCheck %s
 
+// REQUIRES: determinism
+
 #include <omp.h>
 
 void subdomain(float *x, int istart, int ipoints) {
Index: openmp/libompd/test/CMakeLists.txt
===================================================================
--- openmp/libompd/test/CMakeLists.txt
+++ openmp/libompd/test/CMakeLists.txt
@@ -9,25 +9,27 @@
 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()
+
+#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)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137831.474730.patch
Type: text/x-patch
Size: 2607 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20221111/251f9a23/attachment.bin>