mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-05 17:36:12 +00:00
Merge branch 'minor-next' into sync-major-next
This commit is contained in:
5
tests/travis.sh
Executable file → Normal file
5
tests/travis.sh
Executable file → Normal file
@ -7,6 +7,9 @@ while getopts "t:" OPTION 2> /dev/null; do
|
||||
t)
|
||||
PM_WORKERS="$OPTARG"
|
||||
;;
|
||||
\?)
|
||||
break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -42,7 +45,7 @@ if [ "$result" != "" ]; then
|
||||
echo "$result"
|
||||
echo Some tests did not complete successfully, changing build status to failed
|
||||
exit 1
|
||||
elif [ $(grep -c "ERROR\|CRITICAL\|EMERGENCY" "$DATA_DIR/server.log") -ne 0 ]; then
|
||||
elif [ "$(grep -c "ERROR\|CRITICAL\|EMERGENCY" "$DATA_DIR/server.log")" -ne 0 ]; then
|
||||
echo Server log contains error messages, changing build status to failed
|
||||
exit 1
|
||||
else
|
||||
|
Reference in New Issue
Block a user