summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-07-13 23:10:35 +0200
committerGitHub <noreply@github.com>2016-07-13 23:10:35 +0200
commit0d5a0c3df4291f8e272c24e57a16582555506238 (patch)
tree692c84135973f15e2aaf4df8107507433057ee2d
parenta578178faeb66cdc5f329ea15474a1ba06e8ddb2 (diff)
parent1114c646fc28c893add75d512183f084bece9942 (diff)
downloadhercules-0d5a0c3df4291f8e272c24e57a16582555506238.tar.gz
hercules-0d5a0c3df4291f8e272c24e57a16582555506238.tar.bz2
hercules-0d5a0c3df4291f8e272c24e57a16582555506238.tar.xz
hercules-0d5a0c3df4291f8e272c24e57a16582555506238.zip
Merge pull request #1359 from 4144/travis
Add into travis check for hpm.
-rw-r--r--src/char/HPMchar.c3
-rw-r--r--src/login/HPMlogin.c3
-rw-r--r--src/map/HPMmap.c4
-rwxr-xr-xtravis.sh11
4 files changed, 19 insertions, 2 deletions
diff --git a/src/char/HPMchar.c b/src/char/HPMchar.c
index c34866e53..e0f81c61f 100644
--- a/src/char/HPMchar.c
+++ b/src/char/HPMchar.c
@@ -47,10 +47,13 @@
#include "common/db.h"
#include "common/des.h"
#include "common/ers.h"
+#include "common/md5calc.h"
#include "common/memmgr.h"
+#include "common/mutex.h"
#include "common/mapindex.h"
#include "common/mmo.h"
#include "common/nullpo.h"
+#include "common/random.h"
#include "common/showmsg.h"
#include "common/socket.h"
#include "common/spinlock.h"
diff --git a/src/login/HPMlogin.c b/src/login/HPMlogin.c
index 472cba3c9..b35ac13cb 100644
--- a/src/login/HPMlogin.c
+++ b/src/login/HPMlogin.c
@@ -35,9 +35,12 @@
#include "common/db.h"
#include "common/des.h"
#include "common/ers.h"
+#include "common/md5calc.h"
#include "common/memmgr.h"
+#include "common/mutex.h"
#include "common/mmo.h"
#include "common/nullpo.h"
+#include "common/random.h"
#include "common/showmsg.h"
#include "common/socket.h"
#include "common/spinlock.h"
diff --git a/src/map/HPMmap.c b/src/map/HPMmap.c
index 289375323..84544976a 100644
--- a/src/map/HPMmap.c
+++ b/src/map/HPMmap.c
@@ -31,10 +31,14 @@
#include "common/db.h"
#include "common/des.h"
#include "common/ers.h"
+#include "common/grfio.h"
+#include "common/md5calc.h"
#include "common/memmgr.h"
+#include "common/mutex.h"
#include "common/mapindex.h"
#include "common/mmo.h"
#include "common/nullpo.h"
+#include "common/random.h"
#include "common/showmsg.h"
#include "common/socket.h"
#include "common/spinlock.h"
diff --git a/travis.sh b/travis.sh
index 646532374..269395312 100755
--- a/travis.sh
+++ b/travis.sh
@@ -45,6 +45,7 @@ function aborterror {
}
function run_server {
+ echo "Running: $1 --run-once $2"
$1 --run-once $2 2>runlog.txt
export errcode=$?
export teststr=$(cat runlog.txt)
@@ -93,7 +94,8 @@ case "$MODE" in
build)
(cd tools && ./validateinterfaces.py silent) || aborterror "Interface validation error."
./configure $@ || (cat config.log && aborterror "Configure error, aborting build.")
- make sql -j3 || aborterror "Build failed."
+ make -j3 || aborterror "Build failed."
+ make plugins -j3 || aborterror "Build failed."
make plugin.script_mapquit -j3 || aborterror "Build failed."
;;
test)
@@ -128,10 +130,15 @@ EOF
[ $? -eq 0 ] || aborterror "Unable to import configuration, aborting tests."
ARGS="--load-script npc/dev/test.txt "
ARGS="--load-plugin script_mapquit $ARGS --load-script npc/dev/ci_test.txt"
- echo "Running Hercules with command line: ./map-server --run-once $ARGS"
+ PLUGINS="--load-plugin HPMHooking --load-plugin sample"
+ echo "run all servers without HPM"
run_server ./login-server
run_server ./char-server
run_server ./map-server "$ARGS"
+ echo "run all servers wit HPM"
+ run_server ./login-server "$PLUGINS"
+ run_server ./char-server "$PLUGINS"
+ run_server ./map-server "$ARGS $PLUGINS"
;;
getplugins)
echo "Cloning plugins repository..."