[SCM] master: Use testbed code which automatically registers tasks to teardown.

[cagney@sourceware.org]

The branch, master has been updated
       via  85a44d9747806bcf10bb63c835a9f7074cef8e7a (commit)
      from  e5bbc3500616fc2a0d77bbc6cdfe1dd16d5a24ae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 85a44d9747806bcf10bb63c835a9f7074cef8e7a
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Mar 11 21:55:23 2008 -0400

    Use testbed code which automatically registers tasks to teardown.
    
    frysk-core/frysk/proc/live/ChangeLog
    2008-03-11  Andrew Cagney  <cagney@redhat.com>
    
    	* TestTaskObserverCode.java: Do not use
    	Host.requestCreateAttachedProc and
    	StopEventLoopWhenChildProcRemoved.

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

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog               |    4 ++++
 .../frysk/proc/live/TestTaskObserverCode.java      |   16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index db02f13..efa024e 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-11  Andrew Cagney  <cagney@redhat.com>
 
+	* TestTaskObserverCode.java: Do not use
+	Host.requestCreateAttachedProc and
+	StopEventLoopWhenChildProcRemoved.
+
 	* LinuxPtraceProcState.java: Use LogFactory.
 
 	* TestTaskObserverBlocked.java: Register offspring with
diff --git a/frysk-core/frysk/proc/live/TestTaskObserverCode.java b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
index d38a6b2..bce0c7f 100644
--- a/frysk-core/frysk/proc/live/TestTaskObserverCode.java
+++ b/frysk-core/frysk/proc/live/TestTaskObserverCode.java
@@ -65,7 +65,7 @@ import frysk.proc.MemoryMap;
 import java.util.Collection;
 import java.util.Arrays;
 import java.util.Iterator;
-import frysk.testbed.StopEventLoopWhenProcRemoved;
+import frysk.testbed.StopEventLoopWhenProcTerminated;
 import lib.dwfl.ElfException;
 import java.util.ArrayList;
 import lib.dwfl.Elf;
@@ -418,14 +418,8 @@ public class TestTaskObserverCode extends TestLib
 	for (int i = 1; i < argc + 1; i++)
 	    command[i] = Integer.toString(i);
 
-	AttachedObserver ao = new AttachedObserver();
-	Manager.host.requestCreateAttachedProc("/dev/null",
-					       "/dev/null",
-					       "/dev/null", command, ao);
-	assertRunUntilStop("attach then block");
-	assertTrue("AttachedObserver got Task", ao.task != null);
-	
-	task = ao.task;
+	DaemonBlockedAtEntry daemon = new DaemonBlockedAtEntry(command);
+	task = daemon.getMainTask();
 	
 	long address = getGlobalLabelAddress(label);
 	CodeObserver code = new CodeObserver(task, address);
@@ -433,7 +427,7 @@ public class TestTaskObserverCode extends TestLib
 	assertRunUntilStop("add breakpoint observer");
 	
 	// Delete and unblock
-	task.requestDeleteAttachedObserver(ao);
+	daemon.requestRemoveBlock();
 	assertRunUntilStop("wait for breakpoint hit");
 	
 	SignaledObserver so = new SignaledObserver();
@@ -910,7 +904,7 @@ public class TestTaskObserverCode extends TestLib
     task.requestAddTerminatingObserver(terminatingObserver);
     assertRunUntilStop("add terminating observer");
 
-    new StopEventLoopWhenProcRemoved(child);
+    new StopEventLoopWhenProcTerminated(child);
     child.requestRemoveBlock();
     assertRunUntilStop("run \"fork\" until exit");
     assertTrue("breakpoint hit", code1.hit);


hooks/post-receive
--
frysk system monitor/debugger