merge from tip of develop branch.

This commit is contained in:
Shuduo Sang 2020-04-08 17:42:40 +08:00
commit 6acca129df
3 changed files with 8 additions and 6 deletions

View File

@ -46,14 +46,12 @@ before_script:
script:
- cmake ..
- cmake --build .
- cmake --build . || exit $?
- |-
case $TRAVIS_OS_NAME in
linux)
cd ../tests/script
sudo ./test.sh >& out.txt
sync
sleep 2
sudo ./test.sh 2>&1 | tee out.txt
cat out.txt
grep success out.txt
total_success=`grep success out.txt | wc -l`
@ -61,6 +59,9 @@ script:
grep failed out.txt
total_failed=`grep failed out.txt | wc -l`
echo "Total $total_failed failed"
if [ "$total_failed" -ne "0" ]; then
exit $total_failed
fi
;;
esac

View File

@ -1,8 +1,8 @@
#################################
#run general/table/basic1.sim
run general/table/basic2.sim
run general/table/basic1.sim
#run general/table/basic2.sim
#run general/table/basic3.sim
##################################

View File

@ -1,5 +1,6 @@
system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system ifconfig
system sh/exec.sh -n dnode1 -s start
sql connect