[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  0aca86b313d286be979629a3193a12e17bf7171a (commit)
      from  f9fd35248c9a3b1125d9ab82ffb19d62e86533ac (commit)


- Log -----------------------------------------------------------------
commit 0aca86b313d286be979629a3193a12e17bf7171a
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Dec 2 12:20:49 2015 -0500

    Run test_ordinals after update
    
    Catch a common 'make update' failure: conflicting ordinals.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 Makefile.org                                            | 5 ++++-
 test/recipes/{90-test_ordinals.t => 01-test_ordinals.t} | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename test/recipes/{90-test_ordinals.t => 01-test_ordinals.t} (100%)

diff --git a/Makefile.org b/Makefile.org
index 6cd20f8..08c7000 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -436,6 +436,9 @@ rehash.time: certs apps
 
 test:   tests
 
+test_ordinals:
+	$(MAKE) TESTS=test_ordinals test
+
 tests: rehash
 	@(cd test && echo "testing..." && \
 	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
@@ -450,7 +453,7 @@ list-tests:
 report:
 	@$(PERL) util/selftest.pl
 
-update: errors stacks util/libeay.num util/ssleay.num TABLE
+update: errors stacks util/libeay.num util/ssleay.num TABLE test_ordinals
 	@set -e; target=update; $(RECURSIVE_BUILD_CMD)
 
 depend:
diff --git a/test/recipes/90-test_ordinals.t b/test/recipes/01-test_ordinals.t
similarity index 100%
rename from test/recipes/90-test_ordinals.t
rename to test/recipes/01-test_ordinals.t