xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/taosdata/TDengine into develop

This commit is contained in:
Shengliang Guan 2020-06-01 14:55:42 +08:00
parent 4be24ad543 2811288cc6
commit 29cc962fba
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/script/sh/cfg.sh
View File

@ -33,8 +33,8 @@ SCRIPT_DIR=`dirname $0`
cd $SCRIPT_DIR/../ cd $SCRIPT_DIR/../
SCRIPT_DIR=`pwd` SCRIPT_DIR=`pwd`
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../

4
tests/script/sh/clear.sh
View File

@ -36,8 +36,8 @@ cd $SCRIPT_DIR/../
SCRIPT_DIR=`pwd` SCRIPT_DIR=`pwd`
echo "SCRIPT_DIR: $SCRIPT_DIR" echo "SCRIPT_DIR: $SCRIPT_DIR"
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../

4
tests/script/sh/deploy.sh
View File

@ -31,8 +31,8 @@ cd $SCRIPT_DIR/../
SCRIPT_DIR=`pwd` SCRIPT_DIR=`pwd`
echo "SCRIPT_DIR: $SCRIPT_DIR" echo "SCRIPT_DIR: $SCRIPT_DIR"
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../

6
tests/script/sh/exec.sh
View File

@ -42,8 +42,8 @@ SCRIPT_DIR=`dirname $0`
cd $SCRIPT_DIR/../ cd $SCRIPT_DIR/../
SCRIPT_DIR=`pwd` SCRIPT_DIR=`pwd`
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../
@ -95,7 +95,7 @@ else
if [ -n "$PID" ]; then if [ -n "$PID" ]; then
if [ "$SIGNAL" = "SIGINT" ]; then if [ "$SIGNAL" = "SIGINT" ]; then
echo killed by signal echo killed by signal
kill -sigint $PID kill -SIGINT $PID
else else
kill -9 $PID kill -9 $PID
fi fi

4
tests/script/sh/exec_tarbitrator.sh
View File

@ -39,8 +39,8 @@ SCRIPT_DIR=`dirname $0`
cd $SCRIPT_DIR/../ cd $SCRIPT_DIR/../
SCRIPT_DIR=`pwd` SCRIPT_DIR=`pwd`
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../

4
tests/script/test.sh
View File

@ -41,8 +41,8 @@ cd .
CODE_DIR=`dirname $0` CODE_DIR=`dirname $0`
CODE_DIR=`pwd` CODE_DIR=`pwd`
TDINTERNAL="TDinternal" IN_TDINTERNAL="community"
if [[ "$CODE_DIR" == *"$TDINTERNAL"* ]]; then if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. cd ../../..
else else
cd ../../ cd ../../