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

Merge pull request #18284 from taosdata/fix/TD-20530 

test: adjust asan directory
This commit is contained in:
Shengliang Guan 2022-11-20 14:47:58 +08:00 committed by GitHub
parent 21ce57adfa 0b0c27ba63
commit 78f42c1c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/pytest/util/dnodes.py
View File

@ -390,7 +390,7 @@ class TDDnode:
binPath, self.cfgDir) binPath, self.cfgDir)
else: else:
if self.asan: if self.asan:
asanDir = "%s/sim/tsim/asan/dnode%d.asan" % ( asanDir = "%s/sim/asan/dnode%d.asan" % (
self.path, self.index) self.path, self.index)
cmd = "nohup %s -c %s > /dev/null 2> %s & " % ( cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
binPath, self.cfgDir, asanDir) binPath, self.cfgDir, asanDir)
@ -457,7 +457,7 @@ class TDDnode:
if self.valgrind == 0: if self.valgrind == 0:
if self.asan: if self.asan:
asanDir = "%s/sim/tsim/asan/dnode%d.asan" % ( asanDir = "%s/sim/asan/dnode%d.asan" % (
self.path, self.index) self.path, self.index)
cmd = "nohup %s -c %s > /dev/null 2> %s & " % ( cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
binPath, self.cfgDir, asanDir) binPath, self.cfgDir, asanDir)

2
tests/script/sh/checkAsan.sh
View File

@ -15,7 +15,7 @@ else
fi fi
TAOS_DIR=`pwd` TAOS_DIR=`pwd`
LOG_DIR=$TAOS_DIR/sim/tsim/asan LOG_DIR=$TAOS_DIR/sim/asan
error_num=`cat ${LOG_DIR}/*.asan | grep "ERROR" | wc -l` error_num=`cat ${LOG_DIR}/*.asan | grep "ERROR" | wc -l`
memory_leak=`cat ${LOG_DIR}/*.asan | grep "Direct leak" | wc -l` memory_leak=`cat ${LOG_DIR}/*.asan | grep "Direct leak" | wc -l`

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

@ -80,7 +80,7 @@ LOG_DIR=$NODE_DIR/log
DATA_DIR=$NODE_DIR/data DATA_DIR=$NODE_DIR/data
MGMT_DIR=$NODE_DIR/data/mgmt MGMT_DIR=$NODE_DIR/data/mgmt
TSDB_DIR=$NODE_DIR/data/tsdb TSDB_DIR=$NODE_DIR/data/tsdb
ASAN_DIR=$SIM_DIR/tsim/asan ASAN_DIR=$SIM_DIR/asan
TAOS_CFG=$NODE_DIR/cfg/taos.cfg TAOS_CFG=$NODE_DIR/cfg/taos.cfg
echo ------------ $EXEC_OPTON $NODE_NAME echo ------------ $EXEC_OPTON $NODE_NAME

5
tests/script/test.sh
View File

@ -72,7 +72,7 @@ PRG_DIR=$SIM_DIR/tsim
CFG_DIR=$PRG_DIR/cfg CFG_DIR=$PRG_DIR/cfg
LOG_DIR=$PRG_DIR/log LOG_DIR=$PRG_DIR/log
DATA_DIR=$PRG_DIR/data DATA_DIR=$PRG_DIR/data
ASAN_DIR=$PRG_DIR/asan ASAN_DIR=$SIM_DIR/asan
chmod -R 777 $PRG_DIR chmod -R 777 $PRG_DIR
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
@ -143,6 +143,9 @@ if [ -n "$FILE_NAME" ]; then
if [ $result -eq 0 ]; then if [ $result -eq 0 ]; then
$CODE_DIR/sh/checkAsan.sh $CODE_DIR/sh/checkAsan.sh
else else
echo "TSIM has asan errors"
sleep 1
$CODE_DIR/sh/checkAsan.sh
exit 1 exit 1
fi fi
fi fi

2
tests/system-test/test.sh
View File

@ -44,7 +44,7 @@ declare -x BUILD_DIR=$TOP_DIR/$BIN_DIR
declare -x SIM_DIR=$TOP_DIR/sim declare -x SIM_DIR=$TOP_DIR/sim
PROGRAM=$BUILD_DIR/build/bin/tsim PROGRAM=$BUILD_DIR/build/bin/tsim
PRG_DIR=$SIM_DIR/tsim PRG_DIR=$SIM_DIR/tsim
ASAN_DIR=$PRG_DIR/asan ASAN_DIR=$SIM_DIR/asan
SYSTEM_TEST_DIR=$TOP_DIR/tests/system-test SYSTEM_TEST_DIR=$TOP_DIR/tests/system-test
chmod -R 777 $PRG_DIR chmod -R 777 $PRG_DIR