bctest changes for Ultrix (don't return 1 from bctest, otherwise make aborts)

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 4b88bbfb550f840abf57b15f27fd5197469bcfbe..ef41e06e620a6841fea064f7bba7146bce51f16b 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -191,7 +191,7 @@ test_bn:
        @./$(BNTEST) >tmp.bntest
        @echo quit >>tmp.bntest
        @echo "running bc"
-       @<tmp.bntest sh -c "`sh ./bctest; true`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
+       @<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
        @echo 'test a^b%c implementations'
        ./$(EXPTEST)
 

diff --git a/test/bctest b/test/bctest
index fbe74ed90bda53ca57dad5f95528cbd3c115ec19..bdb3218f7acaa2cac934c96c62a402ba5677636c 100755 (executable)
--- a/test/bctest
+++ b/test/bctest
@@ -104,5 +104,8 @@ EOF
 done
 
 echo "No working bc found.  Consider installing GNU bc." >&2
-echo "cat >/dev/null"
+if [ "$1" = ignore ]; then
+  echo "cat >/dev/null"
+  exit 0
+fi
 exit 1