diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | util/selftest.pl | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/.cvsignore b/.cvsignore index 7da3e30cdc..ea182b942c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,5 +7,7 @@ outinc rehash.time testlog make.log +maketest.log cctest cctest.c +cctest.a diff --git a/util/selftest.pl b/util/selftest.pl index 91e962a312..f6ccfded26 100644 --- a/util/selftest.pl +++ b/util/selftest.pl @@ -25,7 +25,7 @@ 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)) { @@ -83,6 +83,11 @@ if (open(TEST,">cctest.c")) { print OUT "Compiler doesn't work.\n"; goto err; } + system("ar r cctest.a"); + if (not -f "cctest.a") { + print OUT "Check your linker (ar).\n"; + goto err; + } } else { print OUT "Can't create cctest.c\n"; } @@ -129,14 +134,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 +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"; } |