Use original alltests target for definitive test list.
This commit is contained in:
parent
afdf366921
commit
a7f5cd7fd5
@ -263,6 +263,7 @@ sub get_tests
|
|||||||
my %targets;
|
my %targets;
|
||||||
my %deps;
|
my %deps;
|
||||||
my %tests;
|
my %tests;
|
||||||
|
my @alltests;
|
||||||
while (my $line = <M>)
|
while (my $line = <M>)
|
||||||
{
|
{
|
||||||
chomp $line;
|
chomp $line;
|
||||||
@ -278,6 +279,7 @@ sub get_tests
|
|||||||
{
|
{
|
||||||
$targets{$t} = '';
|
$targets{$t} = '';
|
||||||
}
|
}
|
||||||
|
@alltests = @t;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($line =~ /^(\S+):(.*)$/ && exists $targets{$1})
|
if (($line =~ /^(\S+):(.*)$/ && exists $targets{$1})
|
||||||
@ -314,7 +316,6 @@ sub get_tests
|
|||||||
$tests .= "$t = $tests{$t}\n";
|
$tests .= "$t = $tests{$t}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
my $all = 'test:';
|
|
||||||
my $each;
|
my $each;
|
||||||
foreach my $t (keys %targets)
|
foreach my $t (keys %targets)
|
||||||
{
|
{
|
||||||
@ -379,7 +380,6 @@ sub get_tests
|
|||||||
'testrsa.pem',
|
'testrsa.pem',
|
||||||
'testsid.pem',
|
'testsid.pem',
|
||||||
'testss',
|
'testss',
|
||||||
'testreq.pem',
|
|
||||||
);
|
);
|
||||||
my $copies = copy_scripts(1, 'test', @copies);
|
my $copies = copy_scripts(1, 'test', @copies);
|
||||||
$copies .= copy_scripts(0, 'test', ('smcont.txt'));
|
$copies .= copy_scripts(0, 'test', ('smcont.txt'));
|
||||||
@ -398,6 +398,8 @@ sub get_tests
|
|||||||
$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);
|
||||||
|
|
||||||
return "$scripts\n$copies\n$tests\n$all\n\n$each";
|
return "$scripts\n$copies\n$tests\n$all\n\n$each";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user