Add into travis configure option --enable-buildbot.

Also disable all known default warnings if build bot option enabled.

5 files changed, 16 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 259b1bf72..62f2f7cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,21 +32,21 @@ matrix:
   - env: ignore=this
   include:
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-buildbot"
   - compiler: clang
-    env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror"
+    env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror"
+    env: CONFIGURE_FLAGS="--enable-debug --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror"
+    env: CONFIGURE_FLAGS="--enable-debug --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --disable-renewal --enable-Werror"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-5 --disable-manager --disable-renewal --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --enable-Werror --enable-buildbot"
   - compiler: gcc
-    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --disable-renewal --enable-Werror"
+    env: LDFLAGS="-fuse-ld=gold" CONFIGURE_FLAGS="--enable-debug --enable-sanitize=full CC=gcc-6 --disable-manager --disable-renewal --enable-Werror --enable-buildbot"
   
 notifications:
   email: false
diff --git a/src/char/char.c b/src/char/char.c
index 613a3deec..5f92e37bf 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -5815,11 +5815,13 @@ int do_init(int argc, char **argv) {
 	sockt->net_config_read(chr->NET_CONF_NAME);
 	chr->sql_config_read(chr->SQL_CONF_NAME);
 
+#ifndef BUILDBOT
 	if (strcmp(chr->userid, "s1")==0 && strcmp(chr->passwd, "p1")==0) {
 		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
 		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
 		ShowNotice("And then change the user/password to use in conf/char-server.conf (or conf/import/char_conf.txt)\n");
 	}
+#endif
 
 	inter->init_sql(chr->INTER_CONF_NAME); // inter server configuration
 
diff --git a/src/common/socket.c b/src/common/socket.c
index 75b6128b6..60759d0bb 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1752,10 +1752,12 @@ void socket_net_config_read(const char *filename)
 		ShowError("No allowed server IP ranges configured. This server won't be able to accept connections from any char servers.\n");
 	}
 	ARR_FIND(0, VECTOR_LENGTH(sockt->allowed_ips), i, SUBNET_MATCH(0, VECTOR_INDEX(sockt->allowed_ips, i).ip, VECTOR_INDEX(sockt->allowed_ips, i).mask));
+#ifndef BUILDBOT
 	if (i != VECTOR_LENGTH(sockt->allowed_ips)) {
 		ShowWarning("Using a wildcard IP range in the allowed server IPs is NOT RECOMMENDED.\n");
 		ShowNotice("Please edit your '%s' allowed list to fit your network configuration.\n", filename);
 	}
+#endif
 	libconfig->destroy(&network_config);
 	return;
 }
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 52af1137e..51e8e5143 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -236,11 +236,13 @@ void chrif_setpasswd(char *pwd) {
 
 // security check, prints warning if using default password
 void chrif_checkdefaultlogin(void) {
+#ifndef BUILDBOT
 	if (strcmp(chrif->userid, "s1")==0 && strcmp(chrif->passwd, "p1")==0) {
 		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
 		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
 		ShowNotice("and then edit your user/password in conf/map-server.conf (or conf/import/map_conf.txt)\n");
 	}
+#endif
 }
 
 // sets char-server's ip address
diff --git a/src/map/map.c b/src/map/map.c
index 779f8d601..30c849ed1 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -6062,7 +6062,9 @@ int do_init(int argc, char *argv[])
 			char ip_str[16];
 			sockt->ip2str(sockt->addr_[0], ip_str);
 
+#ifndef BUILDBOT
 			ShowWarning("Not all IP addresses in /conf/map-server.conf configured, auto-detecting...\n");
+#endif
 
 			if (sockt->naddr_ == 0)
 				ShowError("Unable to determine your IP address...\n");