X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Fpl%2Funix.pl;h=81a6f0b84735e4c4dd75293f37fe57bdcc654c81;hp=b8a218db737b44a82bca97c19336d89e95acee30;hb=0190de80d57ec234f4b15bdab0efd71264239c62;hpb=f5cd3db541cd1fa71bec1c07a9aecc3e0e058096 diff --git a/util/pl/unix.pl b/util/pl/unix.pl index b8a218db73..81a6f0b847 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -26,6 +26,7 @@ else { $cflags="-O"; } } $obj='.o'; +$asm_suffix='.s'; $ofile='-o '; # EXE linking stuff @@ -58,7 +59,6 @@ $bf_enc_src=""; 'x86_64-mont' => 'crypto/bn', 'x86_64-mont5' => 'crypto/bn', 'x86_64-gf2m' => 'crypto/bn', - 'modexp512-x86_64' => 'crypto/bn', 'aes-x86_64' => 'crypto/aes', 'vpaes-x86_64' => 'crypto/aes', 'bsaes-x86_64' => 'crypto/aes', @@ -69,6 +69,16 @@ $bf_enc_src=""; 'rc4-x86_64' => 'crypto/rc4', 'rc4-md5-x86_64' => 'crypto/rc4', 'ghash-x86_64' => 'crypto/modes', + 'aesni-gcm-x86_64' => 'crypto/modes', + 'aesni-sha256-x86_64' => 'crypto/aes', + 'rsaz-x86_64' => 'crypto/bn', + 'rsaz-avx2' => 'crypto/bn', + 'aesni-mb-x86_64' => 'crypto/aes', + 'sha1-mb-x86_64' => 'crypto/sha', + 'sha256-mb-x86_64' => 'crypto/sha', + 'ecp_nistz256-x86_64' => 'crypto/ec', + 'wp-x86_64' => 'crypto/whrlpool', + 'cmll-x86_64' => 'crypto/camellia', ); # If I were feeling more clever, these could probably be extracted @@ -79,6 +89,9 @@ sub platform_perlasm_compile_target for $p (keys %perl1) { +# FIXME: export CC so rsaz-avx2 can test for it, since BSD make does +# not export variables, unlike GNU make. But this also requires fixing +# the .s.o rule to use CC! if ($target eq "\$(OBJ_D)/$p.o") { return << "EOF"; @@ -127,7 +140,7 @@ sub special_compile_target { return << "EOF"; \$(TMP_D)/x86_64-gcc.o: crypto/bn/asm/x86_64-gcc.c - \$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c + \$(CC) \$(LIB_CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c EOF } return undef; @@ -187,13 +200,18 @@ sub fixtests sub fixdeps { - my ($str) = @_; + my ($str, $fakes) = @_; my @t = split(/\s+/, $str); $str = ''; foreach my $t (@t) { $str .= ' ' if $str ne ''; + if (exists($fakes->{$t})) + { + $str .= $fakes->{$t}; + next; + } if ($t =~ /^[^\/]+$/) { $str .= '$(TEST_D)/' . $t; @@ -212,8 +230,8 @@ sub fixrules my ($str) = @_; # Compatible with -j... - $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /; - return $str; +# $str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /; +# return $str; # Compatible with not -j. my @t = split("\n", $str); @@ -225,11 +243,11 @@ sub fixrules if (!$prev) { if ($t =~ /^@/) - { + { $t =~ s/^@/\@cd \$(TEST_D) && /; } - elsif ($t !~ /^\s*#/) - { + elsif ($t !~ /^\s*#/ && $t !~ /^echo/) + { $t = 'cd $(TEST_D) && ' . $t; } } @@ -262,6 +280,8 @@ sub get_tests my %targets; my %deps; my %tests; + my %alltests; + my %fakes; while (my $line = ) { chomp $line; @@ -276,14 +296,30 @@ sub get_tests foreach my $t (@t) { $targets{$t} = ''; + $alltests{$t} = undef; } } - if (($line =~ /^(\S+):(.*)$/ && exists $targets{$1}) - || $line =~ /^(test_ss .*):(.*)/) + if (($line =~ /^(?\S+):(?.*)$/ && exists $targets{$1}) + || $line =~ /^(?test_(ss|gen) .*):(?.*)/) { - my $t = $1; - $deps{$t} = $2; + my $t = $+{t}; + my $d = $+{d}; + # If there are multiple targets stupid FreeBSD make runs the + # rules once for each dependency that matches one of the + # targets. Running the same rule twice concurrently causes + # breakage, so replace with a fake target. + if ($t =~ /\s/) + { + ++$fake; + my @targets = split /\s+/, $t; + $t = "_fake$fake"; + foreach my $f (@targets) + { + $fakes{$f} = $t; + } + } + $deps{$t} = $d; $deps{$t} =~ s/#.*$//; for (;;) { @@ -302,10 +338,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_md2} if $no_md2; - delete $targets{test_rc5} if $no_rc5; + delete $alltests{test_md2} if $no_md2; + delete $alltests{test_rc5} if $no_rc5; my $tests; foreach my $t (keys %tests) @@ -313,27 +349,16 @@ sub get_tests $tests .= "$t = $tests{$t}\n"; } - my $all = 'test:'; my $each; foreach my $t (keys %targets) { next if $t eq ''; - if ($t =~ /^test_ss/) - { - $t =~ s/\s+/ \$(TEST_D)\//g; - $all .= ' test_ss'; - } - else - { - $all .= " $t"; - } - my $d = $deps{$t}; $d =~ s/\.\.\/apps/\$(BIN_D)/g; $d =~ s/\.\.\/util/\$(TEST_D)/g; $d = fixtests($d, \%tests); - $d = fixdeps($d); + $d = fixdeps($d, \%fakes); my $r = $targets{$t}; $r =~ s/\.\.\/apps/..\/\$(BIN_D)/g; @@ -341,12 +366,15 @@ sub get_tests $r =~ s/\.\.\/(\S+)/\$(SRC_D)\/$1/g; $r = fixrules($r); - $each .= "$t: test_scripts $d\n$r\n"; + next if $r eq ''; + + $t =~ s/\s+/ \$(TEST_D)\//g; + + $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 my @copies = ( 'bctest', - 'evptests.txt', 'testgen', 'cms-test.pl', 'tx509', @@ -375,9 +403,14 @@ sub get_tests 'trsa', 'testrsa.pem', 'testsid.pem', + 'testss', + 'testssl', + 'testsslproxy', + 'serverinfo.pem', ); my $copies = copy_scripts(1, 'test', @copies); - $copies .= copy_scripts(0, 'test', ('smcont.txt')); + $copies .= copy_scripts(0, 'test', ('smcont.txt', 'evptests.txt')); + my @utils = ( 'shlib_wrap.sh', 'opensslwrap.sh', @@ -386,13 +419,27 @@ sub get_tests my @apps = ( 'CA.sh', 'openssl.cnf', + 'server2.pem', ); $copies .= copy_scripts(1, 'apps', @apps); - $scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf ocsp smime\n"; + $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 .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n"; + my $all = 'test:'; + foreach my $t (keys %alltests) + { + if (exists($fakes{$t})) + { + $all .= " $fakes{$t}"; + } + else + { + $all .= " $t"; + } + } + return "$scripts\n$copies\n$tests\n$all\n\n$each"; }