X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=tools%2Ftest-build;h=9312940b615198810d0197f0b9abf3e2f9f827c0;hb=5860247c3bf664daac1234f47f68ed30402fe13d;hp=516af0866b159fd1ad9f57a25c2804406f966cd4;hpb=0c34d2844712798812c40d30b786cd5f86d9c850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/tools/test-build b/tools/test-build
index 516af0866..9312940b6 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -18,15 +18,7 @@
 #
 
 
-BEGIN {
-	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 v5.10.0;
 use strict;
 use warnings FATAL => qw(all);
 
@@ -42,8 +34,9 @@ $ENV{INSPIRCD_VERBOSE} = 1;
 
 execute 'git', 'clean', '-dfx';
 
+my $root = dirname $RealDir;
 my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc);
-foreach my $compiler (@compilers) {
+for my $compiler (@compilers) {
 	if (system "$compiler -v > /dev/null 2>&1") {
 		say "Skipping $compiler as it is not installed on this system!";
 		next;
@@ -53,18 +46,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';
-	foreach my $socketengine (@socketengines) {
+	for my $socketengine (@socketengines) {
 		say "Attempting to build using the $compiler compiler and the $socketengine socket engine...";
 		my @configure_flags;
 		if (defined $ENV{TEST_BUILD_MODULES}) {
-			execute './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES};
+			execute "$root/configure", '--enable-extras', $ENV{TEST_BUILD_MODULES};
 			push @configure_flags, '--disable-auto-extras';
 		}
-		if (execute './configure', '--development', '--socketengine', $socketengine, @configure_flags) {
+		if (execute "$root/configure", '--development', '--socketengine', $socketengine, @configure_flags) {
 			say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}
-		if (execute 'make', '--jobs', get_cpu_count + 1, 'install') {
+		if (execute 'make', '--directory', $root, '--jobs', get_cpu_count() + 1, 'install') {
 			say "Failed to compile using the $compiler compiler and the $socketengine socket engine!";
 			exit 1;
 		}