[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  d016d1ec34977fa9305ad5d535b03d6c5677cf1c (commit)
      from  67204031b6655232a0357b74a0233a41a4646f6c (commit)


- Log -----------------------------------------------------------------
commit d016d1ec34977fa9305ad5d535b03d6c5677cf1c
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Thu Dec 14 21:16:41 2017 +0100

    Remove test-runs dir, adjust .gitignore
    
    Ignore libssl.map/libcrypto.map instead of ssl.map/crypto.map
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4932)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                        | 4 ++--
 Configurations/unix-Makefile.tmpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17572d7..7496b0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,8 +80,8 @@ Makefile
 /util/shlib_wrap.sh
 /tags
 /TAGS
-/crypto.map
-/ssl.map
+/libcrypto.map
+/libssl.map
 
 # Windows (legacy)
 /tmp32
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 7f8a322..a514833 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -311,7 +311,7 @@ clean: libclean
 	-$(RM) `find . -name '*{- $objext -}' -a \! -path "./.git/*"`
 	$(RM) core
 	$(RM) tags TAGS doc-nits
-	$(RM) test/.rnd
+	$(RM) -r test/test-runs
 	$(RM) openssl.pc libcrypto.pc libssl.pc
 	-$(RM) `find . -type l -a \! -path "./.git/*"`
 	$(RM) $(TARFILE)