From 66052bef9c3c409807edfad01a8837f7dd40a5a6 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 1 Jun 2020 13:39:57 +0800 Subject: [PATCH 1/2] sigint is invalid signal, fix it with SIGINT. --- tests/script/sh/exec.sh | 2 +- tests/script/sh/exec_up.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh index ebfe8861b0..1fd859213d 100755 --- a/tests/script/sh/exec.sh +++ b/tests/script/sh/exec.sh @@ -95,7 +95,7 @@ else if [ -n "$PID" ]; then if [ "$SIGNAL" = "SIGINT" ]; then echo killed by signal - kill -sigint $PID + kill -SIGINT $PID else kill -9 $PID fi diff --git a/tests/script/sh/exec_up.sh b/tests/script/sh/exec_up.sh index 51ad03fe99..5fba244d28 100755 --- a/tests/script/sh/exec_up.sh +++ b/tests/script/sh/exec_up.sh @@ -100,7 +100,7 @@ else if [ -n "$PID" ]; then if [ "$SIGNAL" = "SIGINT" ]; then echo killed by signal - kill -sigint $PID + kill -SIGINT $PID else kill -9 $PID fi From a83a59a336b917a99d45bcc05f2f4cc61ee7d0ba Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 1 Jun 2020 14:49:43 +0800 Subject: [PATCH 2/2] change TDinternal to community to support non-TDinternal repo name. --- tests/script/sh/cfg.sh | 4 ++-- tests/script/sh/clear.sh | 4 ++-- tests/script/sh/deploy.sh | 4 ++-- tests/script/sh/exec.sh | 4 ++-- tests/script/sh/exec_tarbitrator.sh | 4 ++-- tests/script/test.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh index 0705343fec..3bebc62d3b 100755 --- a/tests/script/sh/cfg.sh +++ b/tests/script/sh/cfg.sh @@ -33,8 +33,8 @@ SCRIPT_DIR=`dirname $0` cd $SCRIPT_DIR/../ SCRIPT_DIR=`pwd` -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../ diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh index 73d022d4f3..3699d52a97 100755 --- a/tests/script/sh/clear.sh +++ b/tests/script/sh/clear.sh @@ -36,8 +36,8 @@ cd $SCRIPT_DIR/../ SCRIPT_DIR=`pwd` echo "SCRIPT_DIR: $SCRIPT_DIR" -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../ diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index e1669ac3d7..1590fdc83a 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -31,8 +31,8 @@ cd $SCRIPT_DIR/../ SCRIPT_DIR=`pwd` echo "SCRIPT_DIR: $SCRIPT_DIR" -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../ diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh index 1fd859213d..0ab8c045ca 100755 --- a/tests/script/sh/exec.sh +++ b/tests/script/sh/exec.sh @@ -42,8 +42,8 @@ SCRIPT_DIR=`dirname $0` cd $SCRIPT_DIR/../ SCRIPT_DIR=`pwd` -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../ diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh index 4da00dff43..1aab55ddaa 100755 --- a/tests/script/sh/exec_tarbitrator.sh +++ b/tests/script/sh/exec_tarbitrator.sh @@ -39,8 +39,8 @@ SCRIPT_DIR=`dirname $0` cd $SCRIPT_DIR/../ SCRIPT_DIR=`pwd` -TDINTERNAL="TDinternal" -if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../ diff --git a/tests/script/test.sh b/tests/script/test.sh index f5485bd881..1714d3ecee 100755 --- a/tests/script/test.sh +++ b/tests/script/test.sh @@ -41,8 +41,8 @@ cd . CODE_DIR=`dirname $0` CODE_DIR=`pwd` -TDINTERNAL="TDinternal" -if [[ "$CODE_DIR" == *"$TDINTERNAL"* ]]; then +IN_TDINTERNAL="community" +if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then cd ../../.. else cd ../../