Make dummy tests to make it easier to physically remove unwanted algorithms.

This should complete PR 75

diff --git a/Configure b/Configure
index e17874063c51a00284315c3aca885135f095b84a..74bd8877e548d84703211fb911c2d1661aefc420 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1449,6 +1449,7 @@ EOF
        my $make_targets = "";
        $make_targets .= " links" if $symlink;
        $make_targets .= " depend" if $depflags ne "" && $make_depend;
+       $make_targets .= " gentests" if $symlink;
        (system $make_command.$make_targets) == 0 or exit $?
                if $make_targets ne "";
        if ( $perl =~ m@^/@) {

diff --git a/Makefile.org b/Makefile.org
index 4209dd1bff2dadac2303eb5f8939618375ecb369..8808dd7922640f49b4eb4e3ae4558b56c9d3d90c 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -564,6 +564,10 @@ links:
        fi; \
        done;
 
+gentests:
+       @(cd test && echo "generating dummy tests (if needed)..." && \
+       $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
+
 dclean:
        rm -f *.bak
        @for i in $(DIRS) ;\

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index 92b3982668febc98b0452387df9990302c71125f..9f57809d01e83effa80f5ef11dd0f35afd1f27c4 100644 (file)
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -94,7 +94,7 @@ top:
 
 all:   exe
 
-exe:   $(EXE)
+exe:   $(EXE) dummytest
 
 files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
@@ -102,6 +102,10 @@ files:
 links:
        @@$(TOP)/util/point.sh Makefile.ssl Makefile
 
+generate: $(SRC)
+$(SRC):
+       @$(TOP)/util/point.sh dummytest.c $@
+
 errors:
 
 install:
@@ -362,6 +366,9 @@ $(EVPTEST): $(EVPTEST).o $(DLIBCRYPTO)
 #$(RDTEST): $(RDTEST).o $(DLIBCRYPTO)
 #      $(CC) -o $(RDTEST) $(CFLAGS) $(RDTEST).o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
 
+dummytest: dummytest.o $(DLIBCRYPTO)
+       $(CC) -o dummytest $(CFLAGS) dummytest.o $(PEX_LIBS) $(LIBCRYPTO) $(EX_LIBS)
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 bftest.o: ../include/openssl/blowfish.h ../include/openssl/e_os2.h

diff --git a/util/pod2mantest b/util/pod2mantest
index 8e913180c54f868a22ae63c3e1d29691c5e005f0..e01c6192a73054ab02663a6a42fba0f9c882c3bc 100755 (executable)
--- a/util/pod2mantest
+++ b/util/pod2mantest
@@ -14,7 +14,7 @@ IFS=:
 if test "$OSTYPE" = "msdosdjgpp"; then IFS=";"; fi
 try_without_dir=false
 # First we try "pod2man", then "$dir/pod2man" for each item in $PATH.
-for dir in dummy:$PATH; do
+for dir in dummy${IFS}$PATH; do
     if [ "$try_without_dir" = true ]; then
       # first iteration
       pod2man=pod2man