bss_log has dollars, so compile it with that warning flag disabled.

[openssl.git] / util / selftest.pl

diff --git a/util/selftest.pl b/util/selftest.pl
index ad0a6ab2d31f944107c0bbe2568b87ed415879be..91aaaeca9d5c1409dbe1f0b2666ef59a5fd877ca 100644 (file)
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -25,6 +25,7 @@ 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)) {
@@ -48,6 +49,7 @@ if (open(IN,"<Makefile.ssl")) {
 
 $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;
@@ -64,6 +66,7 @@ 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";
@@ -72,21 +75,26 @@ 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;
     }
+    system("ar r cctest.a");
+    if (not -f "cctest.a") {
+       print OUT "Check your archive tool (ar).\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/) {
@@ -97,7 +105,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";
@@ -117,15 +125,23 @@ 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)
+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/;
     }
@@ -144,6 +160,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";
 }
@@ -153,8 +178,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";