Commit 3140e42c authored by Torsten Schönfeld's avatar Torsten Schönfeld

Tweak the test environment to work with newer ExtUtils::MakeMaker

parent e8af0b9f
......@@ -294,14 +294,15 @@ package MY; # so that "SUPER" works right
sub test {
my $inherited = shift->SUPER::test(@_);
my $target = qr/test_dynamic :: (?:pure_all|subdirs-test_dynamic)\n\t/;
if ($^O eq 'MSWin32') {
# put "build" into PATH for the tests
# FIXME: Might need tweaking for nmake...
$inherited =~ s/(test_dynamic :: pure_all\n\t)/.IMPORT: PATH\nPATH += ;build\n.EXPORT: PATH\n$1/;
$inherited =~ s/($target)/.IMPORT: PATH\nPATH += ;build\n.EXPORT: PATH\n$1/;
}
else {
# put "build" into LD_LIBRARY_PATH for the tests
$inherited =~ s/(test_dynamic :: pure_all)\n\t/$1\n\tLD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:build /;
$inherited =~ s/($target)/${1}LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:build /;
}
$inherited;
}
......
Markdown is supported
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