config.suffixes = ['.test']
config.test_source_root = os.path.dirname(__file__)
-# Tweak PATH to include llvm tools dir.
+# Tweak PATH to include llvm tools dir and current exec dir.
llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
if (not llvm_tools_dir) or (not os.path.exists(llvm_tools_dir)):
lit_config.fatal("Invalid llvm_tools_dir config attribute: %r" % llvm_tools_dir)
-path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
+path = os.path.pathsep.join((llvm_tools_dir, config.test_exec_root,
+ config.environment['PATH']))
config.environment['PATH'] = path