X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=util%2Fselftest.pl;h=276b81183d2922162c0c034867e9c11558f1d83e;hp=beb36b1a9ec2ef2c45dfb7e6585af2ba9045a8e8;hb=9335a5f7c07cf16d3d167edee078b33c8dab725d;hpb=4c5fac4ac4352f4487f2b8cd4660b40bdd0b8f86

diff --git a/util/selftest.pl b/util/selftest.pl
index beb36b1a9e..276b81183d 100644
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -19,13 +19,14 @@ my $ok=0;
 my $cc="cc";
 my $cversion="??";
 my $sep="-----------------------------------------------------------------------------\n";
+my $not_our_fault="\nPlease ask your system administrator/vendor for more information.\n[Problems with your operating system setup should not be reported\nto the OpenSSL project.]\n";
 
 open(OUT,">$report") or die;
 
 print OUT "OpenSSL self-test report:\n\n";
 
 $uname=`uname -a`;
-$uname="??" if $uname eq "";
+$uname="??\n" if $uname eq "";
 
 $c=`sh config -t`;
 foreach $_ (split("\n",$c)) {
@@ -49,6 +50,7 @@ if (open(IN,"<Makefile.ssl")) {
 
 $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//;
@@ -56,7 +58,7 @@ chomp $cversion;
 
 if (open(IN,"<CHANGES")) {
     while(<IN>) {
-	if (/\*\) (.{0,55})/) {
+	if (/\*\) (.{0,55})/ && !/applies to/) {
 	    $last=$1;
 	    last;
 	}
@@ -75,21 +77,28 @@ print OUT "Compiler:         $cversion\n";
 print OUT "\n";
 
 print "Checking compiler...\n";
-if (open(TEST,">test.c")) {
-    print TEST "#include <stdio.h>\nmain(){printf(\"Hello world\\n\");}\n";
+if (open(TEST,">cctest.c")) {
+    print TEST "#include <stdio.h>\n#include <errno.h>\nmain(){printf(\"Hello world\\n\");}\n";
     close(TEST);
-    system("$cc -o cctest test.c");
+    system("$cc -o cctest cctest.c");
     if (`./cctest` !~ /Hello world/) {
 	print OUT "Compiler doesn't work.\n";
+	print OUT $not_our_fault;
+	goto err;
+    }
+    system("ar r cctest.a /dev/null");
+    if (not -f "cctest.a") {
+	print OUT "Check your archive tool (ar).\n";
+	print OUT $not_our_fault;
 	goto err;
     }
 } else {
-    print OUT "Can't create test.c\n";
+    print OUT "Can't create cctest.c\n";
 }
-if (open(TEST,">test.c")) {
+if (open(TEST,">cctest.c")) {
     print TEST "#include <openssl/opensslv.h>\nmain(){printf(OPENSSL_VERSION_TEXT);}\n";
     close(TEST);
-    system("$cc -o cctest -Iinclude test.c");
+    system("$cc -o cctest -Iinclude cctest.c");
     $cctest = `./cctest`;
     if ($cctest !~ /OpenSSL $version/) {
 	if ($cctest =~ /OpenSSL/) {
@@ -97,10 +106,11 @@ if (open(TEST,">test.c")) {
 	} else {
 	    print OUT "Can't compile test program!\n";
 	}
+	print OUT $not_our_fault;
 	goto err;
     }
 } else {
-    print OUT "Can't create test.c\n";
+    print OUT "Can't create cctest.c\n";
 }
 
 print "Running make...\n";
@@ -122,6 +132,8 @@ 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";
@@ -129,14 +141,14 @@ if (/no-/)
 }
 
 print "Running make test...\n";
-if (system("make test 2>&1 | tee make.log") > 255)
+if (system("make test 2>&1 | tee maketest.log") > 255)
  {
     print OUT "make test failed!\n";
 } else {
     $ok=1;
 }
 
-if ($ok and open(IN,"<make.log")) {
+if ($ok and open(IN,"<maketest.log")) {
     while (<IN>) {
 	$ok=2 if /^platform: $platform/;
     }
@@ -155,6 +167,15 @@ if ($ok != 2) {
     } else {
 	print OUT "make.log not found!\n";
     }
+    if (open(IN,"<maketest.log")) {
+	while (<IN>) {
+	    print OUT;
+	}
+	close(IN);
+	print OUT $sep;
+    } else {
+	print OUT "maketest.log not found!\n";
+    }
 } else {
     print OUT "Test passed.\n";
 }