fixed unittest.pl - more portable

This commit is contained in:
git@daemon.de
2014-03-15 19:02:08 +01:00
parent a1cfe16c3c
commit 979cdd5c99
4 changed files with 7 additions and 4 deletions

View File

@@ -330,7 +330,7 @@ temporarily disabled
</test>
<test check-verify-decrypt-from-alicia>
cmd = $pcp -V vb -c -d -I testsig -x b
expect = /Unittests.*Verified/s
expect = /Verified/s
</test>
#

View File

@@ -23,7 +23,7 @@ use lib qw(lib);
BEGIN {
eval {
use IPC::Run qw( run timeout);
require IPC::Run;
};
};
@@ -221,7 +221,7 @@ sub run3 {
else {
@c = split /\s\s*/, $cmd;
}
my $ret = run \@c, \$input, \$o, \$e, timeout( $timeout );
my $ret = IPC::Run::run( \@c, \$input, \$o, \$e, IPC::Run::timeout( $timeout ));
$$output = $o;
$$error = $e;
return ret;