From: Rich Salz <rsalz@akamai.com>
Date: Wed, 2 Dec 2015 17:20:49 +0000 (-0500)
Subject: Run test_ordinals after update
X-Git-Tag: OpenSSL_1_1_0-pre1~143
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=0aca86b313d286be979629a3193a12e17bf7171a

Run test_ordinals after update

Catch a common 'make update' failure: conflicting ordinals.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/Makefile.org b/Makefile.org
index 6cd20f8770..08c700093a 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