[SCM] master: Fix stray SIGUSR1 from re-"run"ing funit-slave.

[SCM] master: Fix stray SIGUSR1 from re-"run"ing funit-slave.

[cagney]

The branch, master has been updated
       via  aa1f7ca43e95329845f4e504d5cc7190074f6fc9 (commit)
       via  42ff1d52c5ec92043f6260fce8634543b056f508 (commit)
       via  33f041c928919f3d2b38a1b3b4fd13bb1bf79079 (commit)
      from  695ce5e38cd65a6c28565cfbf6d30ab73b0ffc8f (commit)

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

- Log -----------------------------------------------------------------
commit aa1f7ca43e95329845f4e504d5cc7190074f6fc9
Merge: 42ff1d52c5ec92043f6260fce8634543b056f508 695ce5e38cd65a6c28565cfbf6d30ab73b0ffc8f
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date:   Thu Jan 24 14:07:27 2008 -0500

    Fix stray SIGUSR1 from re-"run"ing funit-slave.

commit 42ff1d52c5ec92043f6260fce8634543b056f508
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date:   Thu Jan 24 14:05:26 2008 -0500

    Stop re-"run" of funit-child signaling TestRunner.
    
    frysk-core/frysk/hpd/ChangeLog
    2008-01-24  Andrew Cagney  <cagney@redhat.com>
    
    	* TestCoreCommand.java: Replace TestLinuxCore with
    	CoreFileAtSignal.

commit 33f041c928919f3d2b38a1b3b4fd13bb1bf79079
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date:   Thu Jan 24 13:51:55 2008 -0500

    Simplify TestCoreCommand.
    
    frysk-core/frysk/hpd/ChangeLog
    2008-01-24  Andrew Cagney  <cagney@redhat.com>
    
    	* TestCoreCommand.java: Use sendCommandExpectPrompt.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog            |    7 +++-
 frysk-core/frysk/hpd/TestCoreCommand.java |   60 +++++++++++------------------
 2 files changed, 29 insertions(+), 38 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 1c9d3f4..8d67eb9 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,8 +1,13 @@
 2008-01-24  Andrew Cagney  <cagney@redhat.com>
-	
+
 	* RegsCommand.java: Update; Register moved to frysk.isa.registers.
 	* TestEvalCommands.java: Ditto.
 
+	* TestCoreCommand.java: Use sendCommandExpectPrompt.
+
+	* TestCoreCommand.java: Replace TestLinuxCore with
+	CoreFileAtSignal.
+	
 2008-01-23  Rick Moseley  <rmoseley@redhat.com>
 
 	* TestRunCommand.java (testRunCommandParamter): New.
diff --git a/frysk-core/frysk/hpd/TestCoreCommand.java b/frysk-core/frysk/hpd/TestCoreCommand.java
index e193acd..1051180 100644
--- a/frysk-core/frysk/hpd/TestCoreCommand.java
+++ b/frysk-core/frysk/hpd/TestCoreCommand.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2007 Red Hat Inc.
+// Copyright 2007, 2008 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -40,63 +40,49 @@
 package frysk.hpd;
 
 import java.io.File;
-
-import frysk.proc.Proc;
-import frysk.proc.dead.TestLinuxCore;
-import frysk.testbed.SlaveOffspring;
+import frysk.testbed.CoreFileAtSignal;
 import frysk.Config;
 
 public class TestCoreCommand extends TestLib {
 
+    private final String corefile
+	= Config.getPkgDataFile("test-core-x86").getPath();
+
     public void testCoreCommand() {
 	e = new HpdTestbed();
-	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
-		+ " -noexe\n");
-	e.expect("Attached to core file.*");
-	e.close();
+	e.sendCommandExpectPrompt("core " + corefile + " -noexe",
+				  "Attached to core file.*");
     }
     
     public void testCoreCommandError() {
 	e = new HpdTestbed();
-	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
-		+ "\n");
-	e.expect("Error:*");
-	e.close();
+	e.sendCommandExpectPrompt("core " + corefile,
+				  "Error:.*");
     }
     
     public void testCoreCommandErrorTwo() {
 	e = new HpdTestbed();
-	e.send("core " + Config.getPkgDataFile("test-core-x86").getPath()
-		+ "foo\n");
-	e.expect("Error:*");
-	e.close();
+	e.sendCommandExpectPrompt("core " + corefile + "foo",
+				  "Error:.*");
     }
 
     public void testCoreExeCommand() {
-	TestLinuxCore tester = new TestLinuxCore();
-	SlaveOffspring funit = SlaveOffspring.createDaemon();
-	Proc funitProc = funit.assertFindProcAndTasks();
-	File core = new File(tester.constructCore(funitProc));
+	File exe = Config.getPkgLibFile("funit-hello");
+	File core = CoreFileAtSignal.constructCore(exe);
 	e = new HpdTestbed();
-	e.send("core " + core.getPath() + " "
-	       + SlaveOffspring.getExecutable().getPath() + "\n");
-	e.expect("Attached to core file.*");
-	e.close();
-	core.delete();
+	e.sendCommandExpectPrompt(("core " + core.getPath()
+				   + " " + exe.getPath()),
+				  "Attached to core file.*");
     }
     
     public void testCoreThenRunCommand() {
-	TestLinuxCore tester = new TestLinuxCore();
-	SlaveOffspring funit = SlaveOffspring.createDaemon();
-	Proc funitProc = funit.assertFindProcAndTasks();
-	File core = new File(tester.constructCore(funitProc));
+	File exe = Config.getPkgLibFile("funit-hello");
+	File core = CoreFileAtSignal.constructCore(exe);
 	e = new HpdTestbed();
-	e.send("core " + core.getPath() + " "
-	       + SlaveOffspring.getExecutable().getPath() + "\n");
-	e.expect("Attached to core file.*");
-	e.send("run\n");
-	e.expect("Attached to process*");
-	e.close();
-	core.delete();
+	e.sendCommandExpectPrompt(("core " + core.getPath()
+				   + " " + exe.getPath()),
+				  "Attached to core file.*");
+	e.sendCommandExpectPrompt("run",
+				  "Attached to process.*");
     }
 }


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