diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/lit/lit.cfg.py | 8 | ||||
| -rw-r--r-- | test/lit/lit.site.cfg.py.in | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/lit/lit.cfg.py b/test/lit/lit.cfg.py index 91dc1aeff..df3a21079 100644 --- a/test/lit/lit.cfg.py +++ b/test/lit/lit.cfg.py @@ -6,16 +6,16 @@ config.test_format = lit.formats.ShTest(True) config.suffixes = ['.wat', '.wast'] config.test_source_root = os.path.dirname(__file__) -config.test_exec_root = os.path.join(config.src_root, 'out', 'test') +config.test_exec_root = os.path.join(config.binaryen_build_root, 'test') # Replace all Binaryen tools with their absolute paths -bin_dir = os.path.join(config.binaryen_root, 'bin') +bin_dir = os.path.join(config.binaryen_build_root, 'bin') for tool_file in os.listdir(bin_dir): - tool_path = config.binaryen_root + '/bin/' + tool_file + tool_path = config.binaryen_build_root + '/bin/' + tool_file tool = tool_file[:-4] if tool_file.endswith('.exe') else tool_file config.substitutions.append((tool, tool_path)) # Also make the `not` command available -not_file = config.src_root + '/scripts/not.py' +not_file = config.binaryen_src_root + '/scripts/not.py' python = sys.executable.replace('\\', '/') config.substitutions.append(('not', python + ' ' + not_file)) diff --git a/test/lit/lit.site.cfg.py.in b/test/lit/lit.site.cfg.py.in index 4b976dbad..c5c349ab1 100644 --- a/test/lit/lit.site.cfg.py.in +++ b/test/lit/lit.site.cfg.py.in @@ -1,7 +1,7 @@ import os -config.src_root = r'@CMAKE_SOURCE_DIR@' -config.binaryen_root = r'@CMAKE_BINARY_DIR@' +config.binaryen_src_root = r'@CMAKE_SOURCE_DIR@' +config.binaryen_build_root = r'@CMAKE_BINARY_DIR@' lit_config.load_config( - config, os.path.join(config.src_root, 'test', 'lit', 'lit.cfg.py')) + config, os.path.join(config.binaryen_src_root, 'test', 'lit', 'lit.cfg.py')) |