rpms/dejagnu/devel dejagnu-1.4.4-smp-1.patch, NONE, 1.1 dejagnu-rh.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/dejagnu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24802

Modified Files:
	dejagnu-rh.spec 
Added Files:
	dejagnu-1.4.4-smp-1.patch 
Log Message:
- Applying H.J. Lu's race condition patch. (#166000)


dejagnu-1.4.4-smp-1.patch:
 remote.exp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE dejagnu-1.4.4-smp-1.patch ---
--- dejagnu-1.4.4/lib/remote.exp.smp	2003-10-10 23:42:46.000000000 -0700
+++ dejagnu-1.4.4/lib/remote.exp	2005-08-05 12:32:10.107161990 -0700
@@ -91,9 +91,13 @@ proc local_exec { commandline inp outp t
     # programs that bear children. We can't use tcl's exec because it has
     # no way to timeout programs that hang. *sigh*
     #
+    # The expect command will close the connection when it sees EOF. On
+    # SMP machine, close the connection may send SIGHUP to the child
+    # and cause it to exit before it can exit normally.  We should make
+    # the child to ignore SIGHUP.
     if { "$inp" == "" && "$outp" == "" } {
 	set id -1
-	set result [catch "eval spawn \{${commandline}\}" pid]
+	set result [catch "eval spawn -ignore SIGHUP \{${commandline}\}" pid]
 	if { $result == 0 } {
 	    set result2 0
 	} else {
@@ -134,7 +138,7 @@ proc local_exec { commandline inp outp t
 	    return [list -1 "open of $commandline $inp $outp failed: $errorInfo"]
 	}
 	set pid [pid $id]
-	set result [catch "spawn -leaveopen $id" result2]
+	set result [catch "spawn -ignore SIGHUP -leaveopen $id" result2]
     }
     # Prepend "-" to each pid, to generate the "process group IDs" needed by
     # kill.


Index: dejagnu-rh.spec
===================================================================
RCS file: /cvs/dist/rpms/dejagnu/devel/dejagnu-rh.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dejagnu-rh.spec	9 Dec 2005 22:40:10 -0000	1.12
+++ dejagnu-rh.spec	1 Feb 2006 15:30:37 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: A front end for testing other programs.
 Name: dejagnu
 Version: 1.4.4
-Release: 4.1
+Release: 5
 Epoch: 1
 License: GPL
 Source: ftp://ftp.gnu.org/gnu/dejagnu/dejagnu-1.4.4.tar.gz
@@ -11,6 +11,7 @@
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArchitectures: noarch
 BuildRequires: jadetex docbook-utils-pdf tetex-dvips
+Patch1: dejagnu-1.4.4-smp-1.patch
 
 %description
 DejaGnu is an Expect/Tcl based framework for testing other programs.
@@ -23,6 +24,7 @@
 %prep
 %setup -q -n dejagnu-%{version}
 find . -name \*.rej -exec rm {} \;
+%patch1 -p1
 
 %build
 %configure -v
@@ -57,6 +59,9 @@
 
  
 %changelog
+* Wed Feb 2 2006 Petr Machata <pmachata at redhat.com> 1:1.4.4-5
+- Applying H.J. Lu's race condition patch. (#166000)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt