X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=6472895698bb3bd5d396ad726276242987210a04;hb=c6e40d36b42a7ebf832c3a57d2816a47ee9c9a76;hp=17c98042bc3a933873e859a65bcc66d2dab6b533;hpb=fb029add367bde0b8cb7b719034a39429e59c64c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/test-build b/tools/test-build
index 17c98042b..647289569 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -30,6 +30,9 @@ use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
+use FindBin qw($RealDir);
+
+use lib $RealDir;
 use make::common;
 use make::configure;
 
@@ -48,7 +51,6 @@ foreach my $compiler (@compilers) {
 	push @socketengines, 'epoll' if test_header $compiler, 'sys/epoll.h';
 	push @socketengines, 'kqueue' if test_file $compiler, 'kqueue.cpp';
 	push @socketengines, 'poll' if test_header $compiler, 'poll.h';
-	push @socketengines, 'ports' if test_header $compiler, 'ports.h';
 	foreach my $socketengine (@socketengines) {
 		say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
 		system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES};
@@ -56,19 +58,9 @@ foreach my $compiler (@compilers) {
 			say "Failed to configure 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;
-			}
-		}
-		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;
-			}
+		if (system 'make', '--jobs', get_cpu_count, 'install') {
+			say "Failed to compile using the $compiler compiler and the $socketengine socket engine!";
+			exit 1;
 		}
 		say "Building using the $compiler compiler and the $socketengine socket engine succeeded!";
 	}