[circt-test] fix lit config for circt-bmc #7884
Conversation
fcf9bae to
32e722d
Compare
32e722d to
7a07ffb
Compare
|
One confusing point is that the Github CI can pass this test without path substitution and the additional PATH variable, which seems to be an existing CIRCT binary path in the PATH. |
|
Hmmm, this is interesting. The |
|
Ah sorry, I just now realized that this is for |
Yeah, it's a possible fix that I wasn't sure made sense before. Maybe we should just consider it a workaround to work with the Python script rather than using it to replace the substitution flow. |
integration_test/lit.cfg.py
Outdated
|
|
||
| # Tweak the PATH to include the tools dir. | ||
| llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) | ||
| config.environment['PATH'] = os.pathsep.join([config.circt_tools_dir, config.environment['PATH']]) |
There was a problem hiding this comment.
TestingConfig should not have this member?
f21273c to
d7a810c
Compare
|
Would you like to merge this yourself, or do you want me to do it? |
I'd be really grateful if you could help me merge them for now. Thanks so much! |
399f68e to
c723acf
Compare
Signed-off-by: unlsycn <[email protected]>
|
Oh..sorry, my wrong rebase screwed everything up! |
#7756 adds the SymbiYosys test runner and requires the `sby` feature, but did not add the corresponding available feature in `lit.cfg.py`, so this test never seems to run, and #7763 introduces a syntax error, a backslash in the f-string expression part, in the Python script. Unlike #7884, there is no need to modify PATH variable for the script since `sby` should be in the PATH if we can check it in CMake. Signed-off-by: unlsycn <[email protected]>
llvm#7756 adds the SymbiYosys test runner and requires the `sby` feature, but did not add the corresponding available feature in `lit.cfg.py`, so this test never seems to run, and llvm#7763 introduces a syntax error, a backslash in the f-string expression part, in the Python script. Unlike llvm#7884, there is no need to modify PATH variable for the script since `sby` should be in the PATH if we can check it in CMake. Signed-off-by: unlsycn <[email protected]>
#7857 introduces a Python script to test
circt-bmc, but there are two problems:lit.cfg.pyso that lit can correctly substitute the path in the test.circt-optbut the executable is not in the PATH variable causing python cannot find it. This PR simply addscirct_tool_dirto PATH to resolve it, but I think a better way is to get rid of the python script and allow lit to substitute the path.