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

diff --git a/tools/test-build b/tools/test-build
index 1b0192e31..647289569 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -19,27 +19,31 @@
 
 
 BEGIN {
-	require 5.8.0;
+	require 5.10.0;
 	unless (-f 'configure') {
 		print "Error: $0 must be run from the main source directory!\n";
 		exit 1;
 	}
 }
 
+use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
+use FindBin qw($RealDir);
+
+use lib $RealDir;
 use make::common;
 use make::configure;
 
-$ENV{D} = $ENV{V} = 1;
+$ENV{INSPIRCD_DEBUG} = $ENV{INSPIRCD_VERBOSE} = 1;
 
 system 'git', 'clean', '-dfx';
 
 my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
 foreach my $compiler (@compilers) {
 	if (system "$compiler -v > /dev/null 2>&1") {
-		print "Skipping $compiler as it is not installed on this system!\n";
+		say "Skipping $compiler as it is not installed on this system!";
 		next;
 	}
 	$ENV{CXX} = $compiler;
@@ -47,25 +51,18 @@ 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) {
-		print "Attempting to build using the $compiler compiler and the $socketengine socket engine...\n";
+		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};
 		if (system './configure', '--development', '--socketengine', $socketengine) {
-			print "Failed to configure using the $compiler compiler and the $socketengine socket engine!\n";
-			exit 1;
-		}
-		$ENV{PURE_STATIC} = 1;
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			print "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!\n";
+			say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		delete $ENV{PURE_STATIC};
-		if (system 'make', '-j'.get_cpu_count, 'install') {
-			print "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!\n";
+		if (system 'make', '--jobs', get_cpu_count, 'install') {
+			say "Failed to compile using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		print "Building using the $compiler compiler and the $socketengine socket engine succeeded!\n";
+		say "Building using the $compiler compiler and the $socketengine socket engine succeeded!";
 	}
 
 	system 'git', 'clean', '-dfx';