Merge branch 'minor-next' into sync-major-next

This commit is contained in:
IvanCraft623
2024-09-22 21:44:31 -05:00
34 changed files with 448 additions and 224 deletions

5
tests/travis.sh Executable file → Normal file
View 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