[Openmp-commits] [openmp] 1eaebe1 - [openmp] Use config.test_extra_flags in archer and multiplex tests

[Wenlei He via Openmp-commits]

Author: Han Zhu
Date: 2020-06-25T11:58:52-07:00
New Revision: 1eaebe192f08934527e741ba65d29c933d685680

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

LOG: [openmp] Use config.test_extra_flags in archer and multiplex tests

Summary:
`config.test_extra_flags` is passed in from `lit.site.cfg.in` files, but they're not used in the LIT configs. This variable can be useful for distros which don't have the standard c/c++ headers in the default search paths. Since the tests run clang on c/c++ source code, we rely on `test_extra_flags` to pass in the necessary header files.

This is a similar setup that's also done in litomptarget https://github.com/llvm/llvm-project/blob/master/openmp/libomptarget/test/lit.cfg#L42 and openmp/runtime.

Reviewers: jdoerfert, jdenny, protze.joachim

Reviewed By: jdoerfert

Subscribers: yaxunl, guansong, sstefan1, openmp-commits

Tags: #openmp

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

Added: 
    

Modified: 
    openmp/tools/archer/tests/lit.cfg
    openmp/tools/multiplex/tests/lit.cfg

Removed: 
    


################################################################################
diff  --git a/openmp/tools/archer/tests/lit.cfg b/openmp/tools/archer/tests/lit.cfg
index aa8a24073568..ed4ec4d03b69 100644
--- a/openmp/tools/archer/tests/lit.cfg
+++ b/openmp/tools/archer/tests/lit.cfg
@@ -46,7 +46,8 @@ config.test_flags = " -I " + config.test_source_root + \
     " -I " + config.omp_header_dir + \
     " -L " + config.omp_library_dir + \
     " -Wl,-rpath," + config.omp_library_dir + \
-    " " + config.test_archer_flags
+    " " + config.test_archer_flags + \
+    " " + config.test_extra_flags
 
 config.archer_flags = "-g -O1 -fsanitize=thread"
 

diff  --git a/openmp/tools/multiplex/tests/lit.cfg b/openmp/tools/multiplex/tests/lit.cfg
index e792fc365d9d..52c1000aa072 100644
--- a/openmp/tools/multiplex/tests/lit.cfg
+++ b/openmp/tools/multiplex/tests/lit.cfg
@@ -47,7 +47,8 @@ config.test_flags = " -I " + config.test_source_root + "/.."\
     " -L " + config.omp_library_dir + \
     " -I " + config.ompt_print_callback_dir + \
     " -Wl,-rpath," + config.omp_library_dir + \
-    " " + config.test_openmp_flags
+    " " + config.test_openmp_flags + \
+    " " + config.test_extra_flags
 
 # Allow XFAIL to work
 config.target_triple = [ ]