[pkg-boost-commits] r14240 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-06-01 15:07:26 +0000 (Sun, 01 Jun 2008)
New Revision: 14240

Added:
   boost/trunk/debian/patches/test-child-exit-t1723.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Bugfix.  Ignore child process normal exit.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-05-24 08:23:08 UTC (rev 14239)
+++ boost/trunk/debian/changelog	2008-06-01 15:07:26 UTC (rev 14240)
@@ -1,3 +1,10 @@
+boost1.35 (1.35.0-6) unstable; urgency=low
+
+  * debian/patches/test-child-exit-t1723.patch: New.  Ignore child process
+    if return status is zero (normal); fix for Boost ticket 1723.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 01 Jun 2008 10:06:55 -0500
+
 boost1.35 (1.35.0-5) unstable; urgency=low
 
   * debian/rules: Build using -DBOOST_SP_USE_PTHREADS for armel.

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-05-24 08:23:08 UTC (rev 14239)
+++ boost/trunk/debian/patches/series	2008-06-01 15:07:26 UTC (rev 14240)
@@ -1,3 +1,4 @@
+test-child-exit-t1723.patch
 serialization-intrinsic64.patch
 library-naming.patch
 suppress-compiler-warnings.patch

Added: boost/trunk/debian/patches/test-child-exit-t1723.patch
===================================================================
--- boost/trunk/debian/patches/test-child-exit-t1723.patch	                        (rev 0)
+++ boost/trunk/debian/patches/test-child-exit-t1723.patch	2008-06-01 15:07:26 UTC (rev 14240)
@@ -0,0 +1,29 @@
+Fix for http://svn.boost.org/trac/boost/ticket/1723
+Boost.Test will report an error if a child process exits normally.
+
+Derived from change 44392 of Boost cvs.
+ignore SIGCHLD in case of regular child exit with code 0
+
+
+--- boost1.35-1.35.0.orig/boost/test/impl/execution_monitor.ipp
++++ boost1.35-1.35.0/boost/test/impl/execution_monitor.ipp
+@@ -680,6 +680,9 @@
+ 
+ static void execution_monitor_jumping_signal_handler( int sig, siginfo_t* info, void* context )
+ {
++    if( info->si_signo == SIGCHLD && info->si_code == CLD_EXITED && (int)info->si_status == 0 )
++        return;
++
+     signal_handler::sys_sig()( info, context );
+ 
+     siglongjmp( signal_handler::jump_buffer(), sig );
+@@ -689,6 +692,9 @@
+ 
+ static void execution_monitor_attaching_signal_handler( int sig, siginfo_t* info, void* context )
+ {
++    if( info->si_signo == SIGCHLD && info->si_code == CLD_EXITED && (int)info->si_status == 0 )
++        return;
++
+     if( !debug::attach_debugger( false ) )
+     execution_monitor_jumping_signal_handler( sig, info, context );
+