Replace the geoip module with geo_maxmind, geoban, and geoclass.

[user/henk/code/inspircd.git] / tools / test-build

diff --git a/tools/test-build b/tools/test-build
index b0eb255c02c744b4e8a95627aa72d4079ae670b2..6472895698bb3bd5d396ad726276242987210a04 100755 (executable)
--- a/tools/test-build
+++ b/tools/test-build
@@ -30,10 +30,13 @@ 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';
 
@@ -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,14 +58,8 @@ foreach my $compiler (@compilers) {
                        say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
                        exit 1;
                }
-               $ENV{PURE_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;
-               }
-               delete $ENV{PURE_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!";
+               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!";