X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Fselftest.pl;h=7b32e9f4ff2a1cbdecdabb0f7a21d510bf209b38;hp=0849737ace2f8d1a4886e98d40a08a899950424f;hb=e0fc7961c4fbd27577fb519d9aea2dc788742715;hpb=71308c3bb54678d33f76ec3fcd83d0ab1ed7029a

diff --git a/util/selftest.pl b/util/selftest.pl
index 0849737ace..7b32e9f4ff 100644
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -17,13 +17,16 @@ my $options="??";
 my $last="??";
 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="??\n" if $uname eq "";
 
 $c=`sh config -t`;
 foreach $_ (split("\n",$c)) {
@@ -31,23 +34,31 @@ foreach $_ (split("\n",$c)) {
     $platform0=$1 if (/Configuring for (.*)$/);
 }
 
-system "sh config" if (! -f "Makefile.ssl");
+system "sh config" if (! -f "Makefile");
 
-if (open(IN,"<Makefile.ssl")) {
+if (open(IN,"<Makefile")) {
     while (<IN>) {
 	$version=$1 if (/^VERSION=(.*)$/);
 	$platform=$1 if (/^PLATFORM=(.*)$/);
 	$options=$1 if (/^OPTIONS=(.*)$/);
-	$cc=$1 if (/^CC=(.*)$/);
+	$cc=$1 if (/^CC= *(.*)$/);
     }
     close(IN);
 } else {
-    print OUT "Error running config: no Makefile.ssl!\n";
+    print OUT "Error running config!\n";
 }
 
+$cversion=`$cc -v 2>&1`;
+$cversion=`$cc -V 2>&1` if $cversion =~ "[Uu]sage";
+$cversion=`$cc -V |head -1` if $cversion =~ "Error";
+$cversion=`$cc --version` if $cversion eq "";
+$cversion =~ s/Reading specs.*\n//;
+$cversion =~ s/usage.*\n//;
+chomp $cversion;
+
 if (open(IN,"<CHANGES")) {
     while(<IN>) {
-	if (/\*\) (.{0,55})/) {
+	if (/\*\) (.{0,55})/ && !/applies to/) {
 	    $last=$1;
 	    last;
 	}
@@ -57,28 +68,37 @@ if (open(IN,"<CHANGES")) {
 
 print OUT "OpenSSL version:  $version\n";
 print OUT "Last change:      $last...\n";
+print OUT "Options:          $options\n" if $options ne "";
 print OUT "OS (uname):       $uname";
 print OUT "OS (config):      $os\n";
 print OUT "Target (default): $platform0\n";
 print OUT "Target:           $platform\n";
+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 <stdlib.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")) {
-    print TEST "#include <openssl/opensslv.h>\nmain(){printf(OPENSSL_VERSION_TEXT);}\n";
+if (open(TEST,">cctest.c")) {
+    print TEST "#include <stdio.h>\n#include <stdlib.h>\n#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/) {
@@ -86,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";
@@ -109,15 +130,31 @@ if (system("make 2>&1 | tee make.log") > 255) {
     goto err;
 }
 
+# Not sure why this is here.  The tests themselves can detect if their
+# particular feature isn't included, and should therefore skip themselves.
+# To skip *all* tests just because one algorithm isn't included is like
+# shooting mosquito with an elephant gun...
+#                   -- Richard Levitte, inspired by problem report 1089
+#
+#$_=$options;
+#s/no-asm//;
+#s/no-shared//;
+#s/no-krb5//;
+#if (/no-/)
+#{
+#    print OUT "Test skipped.\n";
+#    goto err;
+#}
+
 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/;
     }
@@ -136,6 +173,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";
 }
@@ -145,7 +191,11 @@ close(OUT);
 print "\n";
 open(IN,"<$report") or die;
 while (<IN>) {
-    last if /$sep/;
+    if (/$sep/) {
+	print "[...]\n";
+	last;
+    }
     print;
 }
-print "Test report in file $report\n";
+print "\nTest report in file $report\n";
+