[Pkg-voip-commits] [asterisk] 04/09: Enable TEST_FRAMEWORK: unit tests modules

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository asterisk.

commit d1266f3be3c173622bc312a427240bc19204796e
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sat Dec 24 18:42:46 2016 +0200

    Enable TEST_FRAMEWORK: unit tests modules
    
    This enables the TEST_FRAMEWORK: building all the test_*.so modules.
    Those are unit test that are executed from within an Asterisk instance.
    
    Enabling TEST_FRAMEWORK changes the ABI as well.
    New ABI hash: 1fb7f5c06d7a2052e38d021b3d8ca151
    
    new ABI hash due to test framework
---
 debian/patches/test_framework.patch | 20 +-------------------
 debian/rules                        |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/patches/test_framework.patch b/debian/patches/test_framework.patch
index d2f7163..345cbb7 100644
--- a/debian/patches/test_framework.patch
+++ b/debian/patches/test_framework.patch
@@ -11,12 +11,6 @@ The modules provide simple tests. Try: asterisk -rx 'test execute all'
 Those modules should not be confused with the tests in the
 asterisk-testsute package.
 
-This breaks the modules ABI, but in a way that should not be an issue in
-our use case. Hence for now we prefer to keep the ABI unmodified for now,
-and hence the change of make_buildopts_h.
-
-Remove the make_buildopts_h change when switching to a new Asterisk version.
-
 --- a/build_tools/cflags-devmode.xml
 +++ b/build_tools/cflags-devmode.xml
 @@ -24,7 +24,4 @@
@@ -30,7 +24,7 @@ Remove the make_buildopts_h change when switching to a new Asterisk version.
 --- a/build_tools/cflags.xml
 +++ b/build_tools/cflags.xml
 @@ -101,4 +101,8 @@
- 			<defaultenabled>yes</defaultenabled>
+ 			<defaultenabled>no</defaultenabled>
  			<depend>native_arch</depend>
  		</member>
 +		<member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
@@ -38,15 +32,3 @@ Remove the make_buildopts_h change when switching to a new Asterisk version.
 +			<support_level>extended</support_level>
 +		</member>
  	</category>
-diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
-index b9f9af2c..cb1bf459 100755
---- a/build_tools/make_buildopts_h
-+++ b/build_tools/make_buildopts_h
-@@ -29,6 +29,7 @@ for x in ${TMP}; do
- 			-o "${x}" = "RADIO_RELAX" \
- 			-o "${x}" = "DEBUG_SCHEDULER" \
- 			-o "${x}" = "DETECT_DEADLOCKS" \
-+			-o "${x}" = "TEST_FRAMEWORK" \
- 			-o "${x}" = "DUMP_SCHEDULER" ; then
- 		# These aren't ABI affecting options, keep them out of AST_BUILDOPTS
- 		continue
diff --git a/debian/rules b/debian/rules
index 14ea5d8..3bbe68a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 # Sanity check for a stable release:
-SAVED_ABI_HASH = da6642af068ee5e6490c5b1d2cc1d238
+SAVED_ABI_HASH = 1fb7f5c06d7a2052e38d021b3d8ca151
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git