提交 3d53b5f8 编写于 作者: A alesapin

Add bridge binary to runner script

上级 ce117ee2
...@@ -9,5 +9,6 @@ echo "Start tests" ...@@ -9,5 +9,6 @@ echo "Start tests"
export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse export CLICKHOUSE_TESTS_SERVER_BIN_PATH=/clickhouse
export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse export CLICKHOUSE_TESTS_CLIENT_BIN_PATH=/clickhouse
export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=/clickhouse-config export CLICKHOUSE_TESTS_BASE_CONFIG_DIR=/clickhouse-config
export CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH=/clickhouse-odbc-bridge
cd /ClickHouse/dbms/tests/integration && pytest $PYTEST_OPTS cd /ClickHouse/dbms/tests/integration && pytest $PYTEST_OPTS
...@@ -51,6 +51,11 @@ if __name__ == "__main__": ...@@ -51,6 +51,11 @@ if __name__ == "__main__":
default=os.environ.get("CLICKHOUSE_TESTS_SERVER_BIN_PATH", os.environ.get("CLICKHOUSE_TESTS_CLIENT_BIN_PATH", "/usr/bin/clickhouse")), default=os.environ.get("CLICKHOUSE_TESTS_SERVER_BIN_PATH", os.environ.get("CLICKHOUSE_TESTS_CLIENT_BIN_PATH", "/usr/bin/clickhouse")),
help="Path to clickhouse binary") help="Path to clickhouse binary")
parser.add_argument(
"--bridge-binary",
default=os.environ.get("CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH", "/usr/bin/clickhouse-odbc-bridge"),
help="Path to clickhouse-odbc-bridge binary")
parser.add_argument( parser.add_argument(
"--configs-dir", "--configs-dir",
default=os.environ.get("CLICKHOUSE_TESTS_BASE_CONFIG_DIR", os.path.join(DEFAULT_CLICKHOUSE_ROOT, "dbms/programs/server")), default=os.environ.get("CLICKHOUSE_TESTS_BASE_CONFIG_DIR", os.path.join(DEFAULT_CLICKHOUSE_ROOT, "dbms/programs/server")),
...@@ -77,10 +82,11 @@ if __name__ == "__main__": ...@@ -77,10 +82,11 @@ if __name__ == "__main__":
if not args.disable_net_host: if not args.disable_net_host:
net = "--net=host" net = "--net=host"
cmd = "docker run {net} --name {name} --user={user} --privileged --volume={bin}:/clickhouse \ cmd = "docker run {net} --name {name} --user={user} --privileged --volume={bridge_bin}:/clickhouse-odbc-bridge --volume={bin}:/clickhouse \
--volume={cfg}:/clickhouse-config --volume={pth}:/ClickHouse -e PYTEST_OPTS='{opts}' {img} ".format( --volume={cfg}:/clickhouse-config --volume={pth}:/ClickHouse -e PYTEST_OPTS='{opts}' {img} ".format(
net=net, net=net,
bin=args.binary, bin=args.binary,
bridge_bin=args.bridge_binary,
cfg=args.configs_dir, cfg=args.configs_dir,
pth=args.clickhouse_root, pth=args.clickhouse_root,
opts=' '.join(args.pytest_args), opts=' '.join(args.pytest_args),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册