From 399f68e60ceabe2abe372f0ee60028a3dbfa8721 Mon Sep 17 00:00:00 2001 From: unlsycn Date: Mon, 25 Nov 2024 18:41:21 +0000 Subject: [PATCH] add circt tool directory to PATH Signed-off-by: unlsycn --- integration_test/circt-test/basic-circt-bmc.mlir | 2 +- integration_test/lit.cfg.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration_test/circt-test/basic-circt-bmc.mlir b/integration_test/circt-test/basic-circt-bmc.mlir index 948a419b525d..cfc991ad0211 100644 --- 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 index 74d62ee5882b..ee2b978922d9 100644 --- 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