merge from tip of develop branch.
This commit is contained in:
commit
6acca129df
|
@ -46,14 +46,12 @@ before_script:
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- cmake ..
|
- cmake ..
|
||||||
- cmake --build .
|
- cmake --build . || exit $?
|
||||||
- |-
|
- |-
|
||||||
case $TRAVIS_OS_NAME in
|
case $TRAVIS_OS_NAME in
|
||||||
linux)
|
linux)
|
||||||
cd ../tests/script
|
cd ../tests/script
|
||||||
sudo ./test.sh >& out.txt
|
sudo ./test.sh 2>&1 | tee out.txt
|
||||||
sync
|
|
||||||
sleep 2
|
|
||||||
cat out.txt
|
cat out.txt
|
||||||
grep success out.txt
|
grep success out.txt
|
||||||
total_success=`grep success out.txt | wc -l`
|
total_success=`grep success out.txt | wc -l`
|
||||||
|
@ -61,6 +59,9 @@ script:
|
||||||
grep failed out.txt
|
grep failed out.txt
|
||||||
total_failed=`grep failed out.txt | wc -l`
|
total_failed=`grep failed out.txt | wc -l`
|
||||||
echo "Total $total_failed failed"
|
echo "Total $total_failed failed"
|
||||||
|
if [ "$total_failed" -ne "0" ]; then
|
||||||
|
exit $total_failed
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
|
|
||||||
#run general/table/basic1.sim
|
run general/table/basic1.sim
|
||||||
run general/table/basic2.sim
|
#run general/table/basic2.sim
|
||||||
#run general/table/basic3.sim
|
#run general/table/basic3.sim
|
||||||
|
|
||||||
##################################
|
##################################
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
system sh/stop_dnodes.sh
|
system sh/stop_dnodes.sh
|
||||||
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
|
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
|
system sh/exec.sh -n dnode1 -s start
|
||||||
sql connect
|
sql connect
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue