Little error in #1309 + use it
This commit is contained in:
parent
a2f411f811
commit
77874022ab
1
Makefile
1
Makefile
|
@ -506,7 +506,6 @@ plackup:
|
|||
-I`pwd`/lemonldap-ng-portal/blib/lib/ \
|
||||
-I`pwd`/lemonldap-ng-manager/blib/lib/ \
|
||||
e2e-tests/conf/sbin/llng-fastcgi-server \
|
||||
-f e2e-tests/custom.pm \
|
||||
-F >e2e-tests/conf/fastcgi.log 2>&1 &
|
||||
|
||||
install_test:
|
||||
|
|
|
@ -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-portal/blib/lib";
|
||||
use lib "__pwd__/lemonldap-ng-manager/blib/lib";
|
||||
require "__pwd__/e2e-tests/custom.pm";
|
||||
</perl>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
[all]
|
||||
|
||||
logLevel = debug
|
||||
require = __pwd__/e2e-tests/custom.pm
|
||||
|
||||
[configuration]
|
||||
|
||||
|
|
|
@ -32,16 +32,16 @@ sub build_jail {
|
|||
|
||||
$self->useSafeJail(1) unless defined $self->useSafeJail;
|
||||
|
||||
if($require) {
|
||||
foreach my $f (split /[, ]+/, $require) {
|
||||
if($f =~ /^[\w\:]+$/) {
|
||||
if ($require) {
|
||||
foreach my $f ( split /[, ]+/, $require ) {
|
||||
if ( $f =~ /^[\w\:]+$/ ) {
|
||||
eval "require $f";
|
||||
}
|
||||
else {
|
||||
eval "require '$f'";
|
||||
eval { require $f; };
|
||||
}
|
||||
if($@) {
|
||||
die "Unable to load required files: $@";
|
||||
if ($@) {
|
||||
die "Unable to load '$f': $@";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue