X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=25981d4a64399e8a04704f2bc9b9ee79da36e681;hb=c5680d6493a07e6625cc84db0639811bb1a45aee;hp=2b9ee4ee20c00e0ac0735f44e58d485b20eba9ec;hpb=1457c8738c707bddde4bb73fafcb618c24be9abe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/test-build b/tools/test-build
index 2b9ee4ee2..25981d4a6 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -2,7 +2,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2014 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2013-2016, 2018-2020 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
@@ -30,15 +30,17 @@ use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
-use FindBin qw($RealDir);
+use File::Basename qw(dirname);
+use FindBin        qw($RealDir);
 
-use lib $RealDir;
+use lib dirname $RealDir;
 use make::common;
 use make::configure;
 
-$ENV{INSPIRCD_DEBUG} = $ENV{INSPIRCD_VERBOSE} = 1;
+$ENV{INSPIRCD_DEBUG} = 3;
+$ENV{INSPIRCD_VERBOSE} = 1;
 
-system 'git', 'clean', '-dfx';
+execute 'git', 'clean', '-dfx';
 
 my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
 foreach my $compiler (@compilers) {
@@ -51,30 +53,23 @@ 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};
-		if (system './configure', '--development', '--socketengine', $socketengine) {
+		my @configure_flags;
+		if (defined $ENV{TEST_BUILD_MODULES}) {
+			execute './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES};
+			push @configure_flags, '--disable-auto-extras';
+		}
+		if (execute './configure', '--development', '--socketengine', $socketengine, @configure_flags) {
 			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 (execute 'make', '--jobs', get_cpu_count() + 1, '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!";
 	}
 
-	system 'git', 'clean', '-dfx';
+	execute 'git', 'clean', '-dfx';
 }