projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore change undone in 1.831 (apparently by accident)
[oweals/openssl.git]
/
util
/
selftest.pl
diff --git
a/util/selftest.pl
b/util/selftest.pl
index 775f1712e909b7ff1abc7fe96f317866aa943429..83fd9f87b94a32e1e30954025d609fa6944c0131 100644
(file)
--- a/
util/selftest.pl
+++ b/
util/selftest.pl
@@
-50,6
+50,7
@@
if (open(IN,"<Makefile.ssl")) {
$cversion=`$cc -v 2>&1`;
$cversion=`$cc -V 2>&1` if $cversion =~ "usage";
$cversion=`$cc -v 2>&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//;
$cversion=`$cc --version` if $cversion eq "";
$cversion =~ s/Reading specs.*\n//;
$cversion =~ s/usage.*\n//;
@@
-132,19
+133,13
@@
if (system("make 2>&1 | tee make.log") > 255) {
$_=$options;
s/no-asm//;
s/no-shared//;
$_=$options;
s/no-asm//;
s/no-shared//;
+s/no-krb5//;
if (/no-/)
{
print OUT "Test skipped.\n";
goto err;
}
if (/no-/)
{
print OUT "Test skipped.\n";
goto err;
}
-if (`echo 4+1 | bc` != 5)
-{
- 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)
{
print "Running make test...\n";
if (system("make test 2>&1 | tee maketest.log") > 255)
{