X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=629e537c4917dcad43beaec921f34241dc3e7f0e;hb=55fa754510a00ea6691b9448389b006136d9e628;hp=b809a401eb1d02769c7c1f0366baf0dede8dcd2a;hpb=d5bb26a391965f8c1a4bb4708abe768e81086927;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/test-build b/tools/test-build
index b809a401e..629e537c4 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -19,27 +19,28 @@
 
 
 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 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;
@@ -49,23 +50,23 @@ foreach my $compiler (@compilers) {
 	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', '--disable-interactive', '--socketengine', $socketengine) {
-			print "Failed to configure using the $compiler compiler and the $socketengine socket engine!\n";
+		if (system './configure', '--development', '--socketengine', $socketengine) {
+			say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		$ENV{PURE_STATIC} = 1;
+		$ENV{INSPIRCD_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 compile with static modules using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		delete $ENV{PURE_STATIC};
+		delete $ENV{INSPIRCD_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";
+			say "Failed to compile with dynamic modules 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';