Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
e98b8355
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e98b8355
编写于
7月 16, 2021
作者:
G
Ganlin Zhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-5352]<fix>:
Unable to run tsim test script on MacOS
上级
09698c15
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
170 addition
and
67 deletion
+170
-67
tests/script/sh/cfg.sh
tests/script/sh/cfg.sh
+13
-5
tests/script/sh/clear.sh
tests/script/sh/clear.sh
+15
-7
tests/script/sh/deploy.sh
tests/script/sh/deploy.sh
+13
-5
tests/script/sh/exec-default.sh
tests/script/sh/exec-default.sh
+12
-4
tests/script/sh/exec-no-random-fail.sh
tests/script/sh/exec-no-random-fail.sh
+21
-13
tests/script/sh/exec-random-fail.sh
tests/script/sh/exec-random-fail.sh
+12
-4
tests/script/sh/exec.sh
tests/script/sh/exec.sh
+13
-4
tests/script/sh/exec_tarbitrator.sh
tests/script/sh/exec_tarbitrator.sh
+12
-4
tests/script/sh/move_dnode.sh
tests/script/sh/move_dnode.sh
+12
-3
tests/script/sh/mv_old_data.sh
tests/script/sh/mv_old_data.sh
+12
-3
tests/script/sh/stop_dnodes.sh
tests/script/sh/stop_dnodes.sh
+22
-10
tests/script/test.sh
tests/script/test.sh
+13
-5
未找到文件。
tests/script/sh/cfg.sh
浏览文件 @
e98b8355
...
...
@@ -8,6 +8,8 @@ if [ $# != 6 ]; then
exit
1
fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
CONFIG_NAME
=
CONFIG_VALUE
=
...
...
@@ -43,10 +45,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/clear.sh
浏览文件 @
e98b8355
...
...
@@ -10,6 +10,8 @@ if [ $# != 6 ]; then
exit
1
fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
NODE_IP
=
MSATER_IP
=
...
...
@@ -46,10 +48,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/deploy.sh
浏览文件 @
e98b8355
...
...
@@ -9,6 +9,8 @@ if [ $# != 4 ]; then
exit
1
fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
NODE
=
while
getopts
"n:i:"
arg
...
...
@@ -41,10 +43,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/exec-default.sh
浏览文件 @
e98b8355
...
...
@@ -8,6 +8,8 @@
# exit 1
# fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
EXEC_OPTON
=
CLEAR_OPTION
=
"false"
...
...
@@ -52,10 +54,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/exec-no-random-fail.sh
浏览文件 @
e98b8355
...
...
@@ -8,6 +8,8 @@
# exit 1
# fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
EXEC_OPTON
=
CLEAR_OPTION
=
"false"
...
...
@@ -52,10 +54,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/exec-random-fail.sh
浏览文件 @
e98b8355
...
...
@@ -8,6 +8,8 @@
# exit 1
# fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
EXEC_OPTON
=
CLEAR_OPTION
=
"false"
...
...
@@ -52,10 +54,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/exec.sh
浏览文件 @
e98b8355
...
...
@@ -8,6 +8,9 @@
# exit 1
# fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
NODE_NAME
=
EXEC_OPTON
=
CLEAR_OPTION
=
"false"
...
...
@@ -52,10 +55,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/exec_tarbitrator.sh
浏览文件 @
e98b8355
...
...
@@ -6,6 +6,8 @@
# exit 1
# fi
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
EXEC_OPTON
=
while
getopts
"n:s:u:x:ct"
arg
do
...
...
@@ -49,10 +51,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/move_dnode.sh
浏览文件 @
e98b8355
...
...
@@ -2,6 +2,9 @@
echo
"Executing move_dnode.sh"
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
SCRIPT_DIR
=
`
dirname
$0
`
cd
$SCRIPT_DIR
/../
SCRIPT_DIR
=
`
pwd
`
...
...
@@ -17,10 +20,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/mv_old_data.sh
浏览文件 @
e98b8355
...
...
@@ -2,6 +2,9 @@
echo
"Executing mv_old_data.sh"
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
SCRIPT_DIR
=
`
dirname
$0
`
cd
$SCRIPT_DIR
/../
SCRIPT_DIR
=
`
pwd
`
...
...
@@ -17,10 +20,16 @@ fi
TAOS_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TAOS_DIR
/
$BIN_DIR
/build
...
...
tests/script/sh/stop_dnodes.sh
浏览文件 @
e98b8355
#!/bin/sh
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
PID
=
`
ps
-ef
|grep /usr/bin/taosd |
grep
-v
grep
|
awk
'{print $2}'
`
if
[
-n
"
$PID
"
]
;
then
echo
systemctl stop taosd
...
...
@@ -10,7 +13,12 @@ PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
while
[
-n
"
$PID
"
]
;
do
echo kill
-9
$PID
pkill
-9
taosd
echo
"Killing processes locking on port 6030"
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
fuser
-k
-n
tcp 6030
else
lsof
-nti
:6030 | xargs
kill
-9
fi
PID
=
`
ps
-ef
|grep
-w
taosd |
grep
-v
grep
|
awk
'{print $2}'
`
done
...
...
@@ -18,7 +26,11 @@ PID=`ps -ef|grep -w tarbitrator | grep -v grep | awk '{print $2}'`
while
[
-n
"
$PID
"
]
;
do
echo kill
-9
$PID
pkill
-9
tarbitrator
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
fuser
-k
-n
tcp 6040
else
lsof
-nti
:6040 | xargs
kill
-9
fi
PID
=
`
ps
-ef
|grep
-w
tarbitrator |
grep
-v
grep
|
awk
'{print $2}'
`
done
tests/script/test.sh
浏览文件 @
e98b8355
...
...
@@ -14,6 +14,8 @@ RELEASE=0
ASYNC
=
0
VALGRIND
=
0
UNIQUE
=
0
UNAME_BIN
=
`
which
uname
`
OS_TYPE
=
`
$UNAME_BIN
`
while
getopts
"f:avu"
arg
do
case
$arg
in
...
...
@@ -51,10 +53,16 @@ fi
TOP_DIR
=
`
pwd
`
TAOSD_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
`
if
[[
"
$OS_TYPE
"
!=
"Darwin"
]]
;
then
cut_opt
=
"--field="
else
cut_opt
=
"-f "
fi
if
[[
"
$TAOSD_DIR
"
==
*
"
$IN_TDINTERNAL
"
*
]]
;
then
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2,3
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2,3
`
else
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
--fields
=
2
`
BIN_DIR
=
`
find
.
-name
"taosd"
|grep bin|head
-n1
|cut
-d
'/'
${
cut_opt
}
2
`
fi
BUILD_DIR
=
$TOP_DIR
/
$BIN_DIR
/build
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录