X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=util%2Fselftest.pl;h=276b81183d2922162c0c034867e9c11558f1d83e;hb=9335a5f7c07cf16d3d167edee078b33c8dab725d;hp=00e95bdefa9374e6aeeaaad2e46383d37eed9f87;hpb=322006dcb1c415c80c2a7fc778333dd8c4eb1677;p=openssl.git diff --git a/util/selftest.pl b/util/selftest.pl index 00e95bdefa..276b81183d 100644 --- a/util/selftest.pl +++ b/util/selftest.pl @@ -50,6 +50,7 @@ if (open(IN,"&1`; $cversion=`$cc -V 2>&1` if $cversion =~ "usage"; +$cversion=`$cc -V |head -1` if $cversion =~ "Error"; $cversion=`$cc --version` if $cversion eq ""; $cversion =~ s/Reading specs.*\n//; $cversion =~ s/usage.*\n//; @@ -57,7 +58,7 @@ chomp $cversion; if (open(IN,") { - if (/\*\) (.{0,55})/) { + if (/\*\) (.{0,55})/ && !/applies to/) { $last=$1; last; } @@ -132,19 +133,13 @@ if (system("make 2>&1 | tee make.log") > 255) { $_=$options; s/no-asm//; s/no-shared//; +s/no-krb5//; if (/no-/) { print OUT "Test skipped.\n"; goto err; } -if (`echo 4+1 | bc` != 5 || (system("sh test/bctest >/dev/null") >> 8) != 0) -{ - print OUT "Can't run bc! Test skipped.\n"; - print OUT $not_our_fault; - goto err; -} - print "Running make test...\n"; if (system("make test 2>&1 | tee maketest.log") > 255) {