Ignore files that, well, should be ignored.

[openssl.git] / util / selftest.pl

diff --git a/util/selftest.pl b/util/selftest.pl
index 0849737ace2f8d1a4886e98d40a08a899950424f..91e962a312c0b2ddfc4d39163b22baa36e15772a 100644 (file)
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -17,6 +17,7 @@ my $options="??";
 my $last="??";
 my $ok=0;
 my $cc="cc";
+my $cversion="??";
 my $sep="-----------------------------------------------------------------------------\n";
 
 open(OUT,">$report") or die;
@@ -24,6 +25,7 @@ open(OUT,">$report") or die;
 print OUT "OpenSSL self-test report:\n\n";
 
 $uname=`uname -a`;
+$uname="??" if $uname eq "";
 
 $c=`sh config -t`;
 foreach $_ (split("\n",$c)) {
@@ -38,13 +40,20 @@ if (open(IN,"<Makefile.ssl")) {
        $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 =~ "usage";
+$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})/) {
@@ -57,28 +66,30 @@ 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")) {
+if (open(TEST,">cctest.c")) {
     print TEST "#include <stdio.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";
        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/) {
@@ -89,7 +100,7 @@ if (open(TEST,">test.c")) {
        goto err;
     }
 } else {
-    print OUT "Can't create test.c\n";
+    print OUT "Can't create cctest.c\n";
 }
 
 print "Running make...\n";
@@ -109,6 +120,14 @@ if (system("make 2>&1 | tee make.log") > 255) {
     goto err;
 }
 
+$_=$options;
+s/no-asm//;
+if (/no-/)
+{
+    print OUT "Test skipped.\n";
+    goto err;
+}
+
 print "Running make test...\n";
 if (system("make test 2>&1 | tee make.log") > 255)
  {
@@ -145,7 +164,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";
+