Commit 77874022 authored by Yadd's avatar Yadd
Browse files

Little error in #1309 + use it

parent a2f411f8
...@@ -506,7 +506,6 @@ plackup: ...@@ -506,7 +506,6 @@ plackup:
-I`pwd`/lemonldap-ng-portal/blib/lib/ \ -I`pwd`/lemonldap-ng-portal/blib/lib/ \
-I`pwd`/lemonldap-ng-manager/blib/lib/ \ -I`pwd`/lemonldap-ng-manager/blib/lib/ \
e2e-tests/conf/sbin/llng-fastcgi-server \ e2e-tests/conf/sbin/llng-fastcgi-server \
-f e2e-tests/custom.pm \
-F >e2e-tests/conf/fastcgi.log 2>&1 & -F >e2e-tests/conf/fastcgi.log 2>&1 &
install_test: install_test:
......
...@@ -7,5 +7,4 @@ SetEnv LLNG_DEFAULTCONFFILE __pwd__/e2e-tests/conf/lemonldap-ng.ini ...@@ -7,5 +7,4 @@ SetEnv LLNG_DEFAULTCONFFILE __pwd__/e2e-tests/conf/lemonldap-ng.ini
use lib "__pwd__/lemonldap-ng-handler/blib/lib"; use lib "__pwd__/lemonldap-ng-handler/blib/lib";
use lib "__pwd__/lemonldap-ng-portal/blib/lib"; use lib "__pwd__/lemonldap-ng-portal/blib/lib";
use lib "__pwd__/lemonldap-ng-manager/blib/lib"; use lib "__pwd__/lemonldap-ng-manager/blib/lib";
require "__pwd__/e2e-tests/custom.pm";
</perl> </perl>
[all] [all]
logLevel = debug logLevel = debug
require = __pwd__/e2e-tests/custom.pm
[configuration] [configuration]
......
...@@ -32,16 +32,16 @@ sub build_jail { ...@@ -32,16 +32,16 @@ sub build_jail {
$self->useSafeJail(1) unless defined $self->useSafeJail; $self->useSafeJail(1) unless defined $self->useSafeJail;
if($require) { if ($require) {
foreach my $f (split /[, ]+/, $require) { foreach my $f ( split /[, ]+/, $require ) {
if($f =~ /^[\w\:]+$/) { if ( $f =~ /^[\w\:]+$/ ) {
eval "require $f"; eval "require $f";
} }
else { else {
eval "require '$f'"; eval { require $f; };
} }
if($@) { if ($@) {
die "Unable to load required files: $@"; die "Unable to load '$f': $@";
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment