Merge pull request #1223 from SaberUK/master+travis

Speed up Travis builds.

1 files changed, 12 insertions, 8 deletions

diff --git a/tools/test-build b/tools/test-build
index 629e537c4..17c98042b 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -56,15 +56,19 @@ foreach my $compiler (@compilers) {
 			say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		$ENV{INSPIRCD_STATIC} = 1;
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!";
-			exit 1;
+		if (!defined $ENV{TEST_BUILD_DYNAMIC}) {
+			$ENV{INSPIRCD_STATIC} = 1;
+			if (system 'make', '-j'.get_cpu_count, 'install') {
+				say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!";
+				exit 1;
+			}
 		}
-		delete $ENV{INSPIRCD_STATIC};
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!";
-			exit 1;
+		if (!defined $ENV{TEST_BUILD_STATIC}) {
+			delete $ENV{INSPIRCD_STATIC};
+			if (system 'make', '-j'.get_cpu_count, 'install') {
+				say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!";
+				exit 1;
+			}
 		}
 		say "Building using the $compiler compiler and the $socketengine socket engine succeeded!";
 	}