generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test suite: chomp->s/\R// to harmonize with mingw 'make test'.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov 2015-10-12 22:24:27 +02:00
parent 4ada8be2a6
commit 85833408b4
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/recipes/00-check_testexes.t
View File

@ -12,7 +12,7 @@ my $OpenSSL_ver = "";
my $Makefile = top_file("Makefile"); my $Makefile = top_file("Makefile");
if (open(FH, $Makefile)) { if (open(FH, $Makefile)) {
$OpenSSL_ver = $OpenSSL_ver =
(map { chomp; s/^VERSION=([^\s]*)\s*$//; $1 } grep { /^VERSION=/ } <FH>)[0]; (map { s/\R//; s/^VERSION=([^\s]*)\s*$//; $1 } grep { /^VERSION=/ } <FH>)[0];
close FH; close FH;
} }
@ -24,14 +24,14 @@ plan skip_all => "because MINFO not found. If you want this test to run, please
my $MINFO_ver = ""; my $MINFO_ver = "";
while(<FH>) { while(<FH>) {
chomp; s/\R//; # chomp;
if (/^VERSION=([^\s]*)\s*$/) { if (/^VERSION=([^\s]*)\s*$/) {
$MINFO_ver = $1; $MINFO_ver = $1;
} }
last if /^RELATIVE_DIRECTORY=test$/; last if /^RELATIVE_DIRECTORY=test$/;
} }
while(<FH>) { while(<FH>) {
chomp; s/\R//; # chomp;
last if /^EXE=/; last if /^EXE=/;
} }
close FH; close FH;

2
test/recipes/10-test_bn.t
View File

@ -25,7 +25,7 @@ my $init = ok(run(test(["bntest"], stdout => $testresults)), 'initialize');
@lines = <DATA>; @lines = <DATA>;
close DATA; close DATA;
} }
chomp(@lines); map { s/\R//; } @lines; # chomp(@lines);
plan tests => scalar grep(/^print /, @lines); plan tests => scalar grep(/^print /, @lines);

2
test/recipes/20-test_enc.t
View File

@ -21,7 +21,7 @@ my $test = catfile(".", "p");
my $cmd = "openssl"; my $cmd = "openssl";
my @ciphers = my @ciphers =
map { chomp; s/^\s+//; s/\s+$//; split /\s+/ } map { s/^\s+//; s/\s+$//; split /\s+/ }
run(app([$cmd, "list", "-cipher-commands"]), capture => 1); run(app([$cmd, "list", "-cipher-commands"]), capture => 1);
plan tests => 1 + (scalar @ciphers)*2; plan tests => 1 + (scalar @ciphers)*2;

2
test/recipes/25-test_req.t
View File

@ -31,7 +31,7 @@ sub run_conversion {
open DATA, "req-check.err"; open DATA, "req-check.err";
SKIP: { SKIP: {
plan skip_all => "skipping req conversion test for $reqfile" plan skip_all => "skipping req conversion test for $reqfile"
if grep /Unknown Public Key/, map { chomp } <DATA>; if grep /Unknown Public Key/, map { s/\R//; } <DATA>;
tconversion("req", "testreq.pem", @openssl_args); tconversion("req", "testreq.pem", @openssl_args);
} }

2
test/recipes/70-test_sslextension.t
View File

@ -60,7 +60,7 @@ my $test_name = "test_sslextension";
setup($test_name); setup($test_name);
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
unless (map { chomp; s/^SHARED_LIBS=\s*//; $_ } unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
grep { /^SHARED_LIBS=/ } grep { /^SHARED_LIBS=/ }
do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne ""; do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne "";

2
test/recipes/70-test_sslsessiontick.t
View File

@ -61,7 +61,7 @@ my $test_name = "test_sslsessiontick";
setup($test_name); setup($test_name);
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
unless (map { chomp; s/^SHARED_LIBS=\s*//; $_ } unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
grep { /^SHARED_LIBS=/ } grep { /^SHARED_LIBS=/ }
do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne ""; do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne "";

2
test/recipes/70-test_sslskewith0p.t
View File

@ -60,7 +60,7 @@ my $test_name = "test_sslskewith0p";
setup($test_name); setup($test_name);
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
unless (map { chomp; s/^SHARED_LIBS=\s*//; $_ } unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
grep { /^SHARED_LIBS=/ } grep { /^SHARED_LIBS=/ }
do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne ""; do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne "";

2
test/recipes/70-test_sslvertol.t
View File

@ -60,7 +60,7 @@ my $test_name = "test_sslextension";
setup($test_name); setup($test_name);
plan skip_all => "$test_name can only be performed with OpenSSL configured shared" plan skip_all => "$test_name can only be performed with OpenSSL configured shared"
unless (map { chomp; s/^SHARED_LIBS=\s*//; $_ } unless (map { s/\R//; s/^SHARED_LIBS=\s*//; $_ }
grep { /^SHARED_LIBS=/ } grep { /^SHARED_LIBS=/ }
do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne ""; do { local @ARGV = ( top_file("Makefile") ); <> })[0] ne "";