[llvm-branch-commits] [openmp] cfd978d - [OpenMP] Fixed test environment of `check-libomptarget-nvptx`

[Shilei Tian via llvm-branch-commits]

Author: Shilei Tian
Date: 2021-01-24T13:18:33-05:00
New Revision: cfd978d5d3c8a06813e25f69ff1386428380a7cb

URL: https://github.com/llvm/llvm-project/commit/cfd978d5d3c8a06813e25f69ff1386428380a7cb
DIFF: https://github.com/llvm/llvm-project/commit/cfd978d5d3c8a06813e25f69ff1386428380a7cb.diff

LOG: [OpenMP] Fixed test environment of `check-libomptarget-nvptx`

D95161 removed the option `--libomptarget-nvptx-path`, which is used in
the tests for `libomptarget-nvptx`.

Reviewed By: jdoerfert

Differential Revision: https://reviews.llvm.org/D95293

Added: 
    

Modified: 
    openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg b/openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
index a7a327cd4d14..5b9be32db55f 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
+++ b/openmp/libomptarget/deviceRTLs/nvptx/test/lit.cfg
@@ -32,8 +32,7 @@ config.test_format = lit.formats.ShTest()
 
 # compiler flags
 config.test_flags = " -I " + config.omp_header_directory + \
-    " -L " + config.library_dir + \
-    " --libomptarget-nvptx-path=" + config.library_dir;
+    " -L " + config.library_dir
 
 if config.omp_host_rtl_directory:
     config.test_flags = config.test_flags + \
@@ -42,6 +41,7 @@ if config.omp_host_rtl_directory:
 config.test_flags = config.test_flags + " " + config.test_extra_flags
 
 # Setup environment to find dynamic library at runtime.
+prepend_library_path('LIBRARY_PATH', config.library_dir, ":")
 prepend_library_path('LD_LIBRARY_PATH', config.library_dir, ":")
 prepend_library_path('LD_LIBRARY_PATH', config.omp_host_rtl_directory, ":")