some updates from 0.9.7-dev

diff --git a/CHANGES b/CHANGES
index 7abb51d95707ac3c286078ad0e9b55efc4b955c8..2de3e3c0fa8d9dd99f45aeb850d496a558af5c85 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,9 @@
 
  Changes between 0.9.6a and 0.9.6b  [XX xxx XXXX]
 
-  *)
+  *) Change bctest again: '-x' expressions are not available in all
+     versions of 'test'.
+     [Bodo Moeller]
 
  Changes between 0.9.6 and 0.9.6a  [5 Apr 2001]
 

diff --git a/Makefile.org b/Makefile.org
index 0d685c1906433160dc5e56deb4268d81c17572bf..26de86d81768aaa4b25d9927191aeada90cd7510 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -474,19 +474,19 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @echo installing man 1 and man 5
        @for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
-               sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \
+               if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
+               echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
                         --release=$(VERSION) `basename $$i`) \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done
-       @echo installing man 3 and man 7
        @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
-               sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \
+               if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
+               echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
                (cd `dirname $$i`; \
                $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
                        --release=$(VERSION) `basename $$i`) \

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index e02ab59142bbc28247053e672a6e8febaa5407c7..4b88bbfb550f840abf57b15f27fd5197469bcfbe 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; 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"'
        @echo 'test a^b%c implementations'
        ./$(EXPTEST)
 

diff --git a/test/bctest b/test/bctest
index 17b75d4ecabdbb547ead3376992f7651d091d929..fbe74ed90bda53ca57dad5f95528cbd3c115ec19 100755 (executable)
--- a/test/bctest
+++ b/test/bctest
@@ -12,10 +12,22 @@
 
 
 IFS=:
-for dir in $PATH; do
-    bc="$dir/bc"
+try_without_dir=true
+# First we try "bc", then "$dir/bc" for each item in $PATH.
+for dir in dummy:$PATH; do
+    if [ "$try_without_dir" = true ]; then
+      # first iteration
+      bc=bc
+      try_without_dir=false
+    else
+      # second and later iterations
+      bc="$dir/bc"
+      if [ ! -f "$bc" ]; then  # '-x' is not available on Ultrix
+        bc=''
+      fi
+    fi
 
-    if [ -x "$bc" -a ! -d "$bc" ]; then
+    if [ ! "$bc" = '' ]; then
         failure=none