Adds SQL to travis. Other travis optimizations

tools/travis/before_build_byond.sh

@@ -6,7 +6,7 @@ if [ "$BUILD_TOOLS" = true ]; then
   exit 0
 fi;
 echo "Combining maps for building"
-if [ "$DM_MAPFILE" = "loadallmaps" ]; then
+if [ $BUILD_TESTING = true ]; then
     python tools/travis/template_dm_generator.py
 fi;
 

tools/travis/build_byond.sh

@@ -41,17 +41,33 @@ if [ "$BUILD_TOOLS" = false ]; then
 		exit 1
 	fi;
 
-	#config folder should not be mandatory
-	rm -rf config/*
-	
-	#disable all ruins
-	echo -e "LAVALAND_BUDGET 0\nSPACE_BUDGET 0" > config/config.txt
-
     source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
 	if [ "$BUILD_TESTING" = true ]; then
 		tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS tgstation.dme
 	else
-		tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme && DreamDaemon tgstation.dmb -close -trusted -params "test-run&log-directory=travis"
+		tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme
+		
+		#config folder should not be mandatory
+		rm -rf config/*
+
+		#test config
+		cp tools/travis/travis_config.txt config/config.txt
+
+		# get libmariadb, cache it so limmex doesn't get angery
+		if [ -f $HOME/libmariadb ]; then
+			#travis likes to interpret the cache command as it being a file for some reason
+			rm $HOME/libmariadb
+			mkdir $HOME/libmariadb
+		fi
+		if [ ! -f $HOME/libmariadb/libmariadb.so ]; then
+			wget http://www.byond.com/download/db/mariadb_client-2.0.0-linux.tgz
+			tar -xvf mariadb_client-2.0.0-linux.tgz
+			mv mariadb_client-2.0.0-linux/libmariadb.so $HOME/libmariadb/libmariadb.so
+			rm -rf mariadb_client-2.0.0-linux.tgz mariadb_client-2.0.0-linux
+		fi
+    	ln -s $HOME/libmariadb/libmariadb.so libmariadb.so
+	
+		DreamDaemon tgstation.dmb -close -trusted -params "test-run&log-directory=travis"
 		cat data/logs/travis/clean_run.lk
 	fi;
 fi;

tools/travis/build_dependencies.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$BUILD_TOOLS" = false ]; then
+if [ $BUILD_TOOLS = false ] && [ $BUILD_TESTING = false ]; then
     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu
     source ~/.profile
 

tools/travis/travis_config.txt

@@ -0,0 +1,9 @@
+SQL_ENABLED
+ADDRESS 127.0.0.1
+PORT 3306
+FEEDBACK_DATABASE tg_travis
+FEEDBACK_TABLEPREFIX
+FEEDBACK_LOGIN root
+FEEDBACK_PASSWORD
+LAVALAND_BUDGET 0
+SPACE_BUDGET 0