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

Make sure all tests are actually run, plus some fixups for things that

Browse Source 
turn out to be made somewhere by existing Makefiles.
This commit is contained in:
Ben Laurie 2013-04-07 16:52:54 +01:00
parent a7f5cd7fd5
commit 29d422e2a0
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Makefile
View File

@ -313,7 +313,7 @@ test_dsa: $(DSATEST)
../util/shlib_wrap.sh ./$(DSATEST) ../util/shlib_wrap.sh ./$(DSATEST)
../util/shlib_wrap.sh ./$(DSATEST) -app2_1 ../util/shlib_wrap.sh ./$(DSATEST) -app2_1
test_gen: ../apps/openssl testgen test.cnf test_gen testreq.pem: ../apps/openssl testgen test.cnf
@echo "Generate and verify a certificate request" @echo "Generate and verify a certificate request"
@sh ./testgen @sh ./testgen

2
test/testenc
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
testsrc=Makefile testsrc=testenc
test=./p test=./p
cmd="../util/shlib_wrap.sh ../apps/openssl" cmd="../util/shlib_wrap.sh ../apps/openssl"

33
util/pl/unix.pl
View File

@ -263,7 +263,7 @@ sub get_tests
my %targets; my %targets;
my %deps; my %deps;
my %tests; my %tests;
my @alltests; my %alltests;
while (my $line = <M>) while (my $line = <M>)
{ {
chomp $line; chomp $line;
@ -278,15 +278,15 @@ sub get_tests
foreach my $t (@t) foreach my $t (@t)
{ {
$targets{$t} = ''; $targets{$t} = '';
$alltests{$t} = undef;
} }
@alltests = @t;
} }
if (($line =~ /^(\S+):(.*)$/ && exists $targets{$1}) if (($line =~ /^(?<t>\S+):(?<d>.*)$/ && exists $targets{$1})
|| $line =~ /^(test_ss .*):(.*)/) || $line =~ /^(?<t>test_(ss|gen) .*):(?<d>.*)/)
{ {
my $t = $1; my $t = $+{t};
$deps{$t} = $2; $deps{$t} = $+{d};
$deps{$t} =~ s/#.*$//; $deps{$t} =~ s/#.*$//;
for (;;) for (;;)
{ {
@ -305,10 +305,10 @@ sub get_tests
} }
} }
delete $targets{test_jpake} if $no_jpake; delete $alltests{test_jpake} if $no_jpake;
delete $targets{test_ige} if $no_ige; delete $targets{test_ige} if $no_ige;
delete $targets{test_md2} if $no_md2; delete $alltests{test_md2} if $no_md2;
delete $targets{test_rc5} if $no_rc5; delete $alltests{test_rc5} if $no_rc5;
my $tests; my $tests;
foreach my $t (keys %tests) foreach my $t (keys %tests)
@ -335,22 +335,13 @@ sub get_tests
next if $r eq ''; next if $r eq '';
if ($t =~ /^test_ss/)
{
$t =~ s/\s+/ \$(TEST_D)\//g; $t =~ s/\s+/ \$(TEST_D)\//g;
$all .= ' test_ss';
}
else
{
$all .= " $t";
}
$each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n"; $each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n";
} }
# FIXME: Might be a clever way to figure out what needs copying # FIXME: Might be a clever way to figure out what needs copying
my @copies = ( 'bctest', my @copies = ( 'bctest',
'evptests.txt',
'testgen', 'testgen',
'cms-test.pl', 'cms-test.pl',
'tx509', 'tx509',
@ -394,11 +385,13 @@ sub get_tests
); );
$copies .= copy_scripts(1, 'apps', @apps); $copies .= copy_scripts(1, 'apps', @apps);
$scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf ocsp smime\n"; $copies .= copy_scripts(1, 'crypto/evp', ('evptests.txt'));
$scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
$scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n"; $scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n";
$scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n"; $scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n";
my $all = 'test: ' . join(' ', @alltests); my $all = 'test: ' . join(' ', keys %alltests);
return "$scripts\n$copies\n$tests\n$all\n\n$each"; return "$scripts\n$copies\n$tests\n$all\n\n$each";
} }