add project_src_dir so tests work with both bazel and cmake

j2kun · Oct 31, 2023 · 1902439 · 1902439
1 parent d39dcdb
commit 1902439
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/tests/lit.cfg.py b/tests/lit.cfg.py
@@ -40,3 +40,8 @@
     + ":"
     + os.environ["PATH"]
 )
+
+substitutions = {
+    "%project_source_dir": runfiles_dir.joinpath(Path('mlir_tutorial')),
+}
+config.substitutions.extend(substitutions.items())
diff --git a/tests/lit.cmake.cfg.py b/tests/lit.cmake.cfg.py
@@ -25,6 +25,7 @@
 
 config.substitutions.append(("%PATH%", config.environment["PATH"]))
 config.substitutions.append(("%shlibext", config.llvm_shlib_ext))
+config.substitutions.append(("%project_source_dir", config.project_source_dir))
 
 llvm_config.with_system_environment(["HOME", "INCLUDE", "LIB", "TMP", "TEMP"])
 
@@ -49,4 +50,4 @@
     "tutorial-opt"
 ]
 
-llvm_config.add_tool_substitutions(tools, tool_dirs)
+llvm_config.add_tool_substitutions(tools, tool_dirs)
diff --git a/tests/lit.cmake.site.cfg.py.in b/tests/lit.cmake.site.cfg.py.in
@@ -10,4 +10,4 @@ import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
-lit_config.load_config(config, "@PROJECT_SOURCE_DIR@/tests/lit.cmake.cfg.py")
+lit_config.load_config(config, "@PROJECT_SOURCE_DIR@/tests/lit.cmake.cfg.py")
diff --git a/tests/poly_to_llvm.mlir b/tests/poly_to_llvm.mlir
@@ -1,5 +1,5 @@
 // RUN: tutorial-opt --poly-to-llvm %s | mlir-translate --mlir-to-llvmir | llc --relocation-model=pic -filetype=obj > %t
-// RUN: clang -c poly_to_llvm_main.c
+// RUN: clang -c %project_source_dir/tests/poly_to_llvm_main.c
 // RUN: clang poly_to_llvm_main.o %t -o a.out
 // RUN: ./a.out | FileCheck %s
 

diff --git a/tests/poly_to_llvm_eval.mlir b/tests/poly_to_llvm_eval.mlir
@@ -1,5 +1,5 @@
 // RUN: tutorial-opt --poly-to-llvm %s | mlir-translate --mlir-to-llvmir | llc --relocation-model=pic -filetype=obj > %t
-// RUN: clang -c poly_to_llvm_main.c
+// RUN: clang -c %project_source_dir/tests/poly_to_llvm_main.c
 // RUN: clang poly_to_llvm_main.o %t -o eval_test.out
 // RUN: ./eval_test.out | FileCheck %s