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

@@ -1,7 +1,7 @@
Installation Instructions Installation Instructions
************************* *************************
Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
Inc. Inc.
Copying and distribution of this file, with or without modification, Copying and distribution of this file, with or without modification,

View File

@@ -158,6 +158,9 @@
*/ */
#undef LT_OBJDIR #undef LT_OBJDIR
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Name of package */ /* Name of package */
#undef PACKAGE #undef PACKAGE

View File

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

View File

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