add circt tool directory to PATH

Signed-off-by: unlsycn <unlsycn@unlsycn.com>
llvm · Nov 26, 2024 · 399f68e · 399f68e
1 parent dbdd8ef
commit 399f68e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/integration_test/circt-test/basic-circt-bmc.mlir b/integration_test/circt-test/basic-circt-bmc.mlir
@@ -1,3 +1,3 @@
-// RUN: env Z3LIB=%libz3 PATH=%circt-tools-dir:$PATH not circt-test %S/basic.mlir -r circt-test-runner-circt-bmc.py --mlir-runner 2>&1 | FileCheck %S/basic.mlir
+// RUN: env Z3LIB=%libz3 not circt-test %S/basic.mlir -r circt-test-runner-circt-bmc.py --mlir-runner 2>&1 | FileCheck %S/basic.mlir
 // REQUIRES: libz3
 // REQUIRES: circt-bmc-jit
diff --git a/integration_test/lit.cfg.py b/integration_test/lit.cfg.py
@@ -63,8 +63,9 @@
 # test_exec_root: The root path where tests should be run.
 config.test_exec_root = os.path.join(config.circt_obj_root, 'integration_test')
 
-# Tweak the PATH to include the tools dir.
+# Tweak the PATH to include the LLVM and CIRCT tools dir.
 llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)
+llvm_config.with_environment('PATH', config.circt_tools_dir, append_path=True)
 
 # Tweak the PYTHONPATH to include the binary dir.
 if config.bindings_python_enabled:
@@ -230,7 +231,6 @@
   config.available_features.add('arcilator-jit')
 
 config.substitutions.append(('%driver', f'{config.driver}'))
-config.substitutions.append(('%circt-tools-dir', f'{config.circt_tools_dir}'))
 llvm_config.add_tool_substitutions(tools, tool_dirs)
 
 # cocotb availability