public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: swagiaal: Changed CoreFileAtSignal to return core File instead of core Proc.
@ 2007-11-09 15:28 swagiaal
0 siblings, 0 replies; only message in thread
From: swagiaal @ 2007-11-09 15:28 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via b0961692e1128f38fc66e23bdfa710e102b03fbb (commit)
via d45e53827daa98b1110dc481207bd1d0b996eb3e (commit)
from 6c44fcf8aa2f01b9cc33e1a44994baac43d02a4a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit b0961692e1128f38fc66e23bdfa710e102b03fbb
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date: Fri Nov 9 09:42:24 2007 -0500
swagiaal: Changed CoreFileAtSignal to return core File instead of core Proc.
frysk-core/frysk/bindir/ChangeLog
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Changed CoreFileAtSignal to return core File instead of core Proc.
+ * TestFstack.java: Updated.
+
frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Changed CoreFileAtSignal to return core File instead of core Proc.
+ * TestWhereCommand.java: Updated.
+
frysk-core/frysk/testbed/ChangeLog
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * CoreFileAtSignal.java (constructCore): Now return core file
+ instead of proc.
+ * TestCoreFileAtSignal.java (testCoreFileAtSignal): Updated.
+ Corrected path to executable.
+
commit d45e53827daa98b1110dc481207bd1d0b996eb3e
Author: Sami Wagiaalla <swagiaal@redhat.com>
Date: Thu Nov 8 15:23:56 2007 -0500
swagiaal: Corefile tests now pass exe argument. fix for 5156
frysk-core/frysk/bindir/ChangeLog
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * TestFstack.java (testBackTraceWithDashV): Reenabled test.
+ Now passes executable as an argument to fstack.
+
frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * TestWhereCommand.java: Reenabled tests.
+ Tests now use HpdCoreFileTestBed.
+ * HpdTestbed.java (HpdTestbed): Changed t protected
+ from private.
+ * HpdCoreFileTestbed.java: New file.
+
frysk-core/frysk/testbed/ChangeLog
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * CoreFileAtSignal.java: Now passes executable path to core file
+ constructor.
+
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/bindir/ChangeLog | 10 ++++
frysk-core/frysk/bindir/TestFstack.java | 44 ++++++++++----------
frysk-core/frysk/hpd/ChangeLog | 13 ++++++
...ExamineCommand.java => HpdCoreFileTestbed.java} | 23 ++++++----
frysk-core/frysk/hpd/HpdTestbed.java | 2 +-
frysk-core/frysk/hpd/TestWhereCommand.java | 24 ++++++-----
frysk-core/frysk/testbed/ChangeLog | 12 +++++
frysk-core/frysk/testbed/CoreFileAtSignal.java | 11 +----
frysk-core/frysk/testbed/TestCoreFileAtSignal.java | 7 +++-
9 files changed, 93 insertions(+), 53 deletions(-)
copy frysk-core/frysk/hpd/{TestExamineCommand.java => HpdCoreFileTestbed.java} (85%)
First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index efc7825..df7585f 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Changed CoreFileAtSignal to return core File instead of core Proc.
+ * TestFstack.java: Updated.
+
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * TestFstack.java (testBackTraceWithDashV): Reenabled test.
+ Now passes executable as an argument to fstack.
+
2007-11-08 Petr Machata <pmachata@redhat.com>
* fltrace.java (MyLtraceObserver.pidInfo): new method
diff --git a/frysk-core/frysk/bindir/TestFstack.java b/frysk-core/frysk/bindir/TestFstack.java
index ea97b26..c8d6f3c 100644
--- a/frysk-core/frysk/bindir/TestFstack.java
+++ b/frysk-core/frysk/bindir/TestFstack.java
@@ -39,9 +39,10 @@
package frysk.bindir;
+import java.io.File;
+
import frysk.Config;
import frysk.expunit.Expect;
-import frysk.proc.Proc;
import frysk.testbed.CoreFileAtSignal;
import frysk.testbed.TestLib;
@@ -65,88 +66,87 @@ public class TestFstack
public void testBackTrace () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid()
+ coreFile.getAbsolutePath()
});
// Just look for main.
e.expect ("main");
}
public void testBackTraceWithParams () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid(),
+ coreFile.getAbsolutePath(),
"--print","params"
});
e.expect ("int param1");
}
public void testBackTraceWithScopes () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid(),
+ coreFile.getAbsolutePath(),
"--print", "scopes"
});
e.expect ("int one.*int two");
}
public void testBackTraceWithFullpath () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid(),
+ coreFile.getAbsolutePath(),
"--print", "fullpath"
});
e.expect (Config.getRootSrcDir()
+ ".*"
- + proc.getCommand()
+ + "funit-stacks"
+ ".c#");
}
public void testBackTraceWithDashA () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid(),
+ coreFile.getAbsolutePath(),
"-a"
});
e.expect ("fourth.*int param1.*int param2.*int param3.*"
+ Config.getRootSrcDir()
+ ".*"
- + proc.getCommand() + "\\.c#"
+ + "funit-stacks" + "\\.c#"
+ ".*char var1.*"
+ "");
}
public void testBackTraceWithDashC () {
- Proc proc = CoreFileAtSignal.constructCore("funit-stacks");
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
- "core." + proc.getPid(),
+ coreFile.getAbsolutePath(),
"-c"
});
e.expect ("fourth.*int param1.*int param2.*int param3.*"
+ Config.getRootSrcDir()
+ ".*"
- + proc.getCommand() + "\\.c#"
+ + "funit-stacks" + "\\.c#"
+ "");
}
public void testBackTraceWithDashV () {
- if(unresolved(5156)){
- return;
- }
- Proc proc = CoreFileAtSignal.constructCore("funit-inlined");
+
+ File coreFile = CoreFileAtSignal.constructCore("funit-inlined");
e = new Expect (new String[] {
Config.getBinFile("fstack").getAbsolutePath (),
+ coreFile.getAbsolutePath(),
+ Config.getPkgLibFile("funit-inlined").getAbsolutePath(),
"-v",
- "-a",
- "core." + proc.getPid()
+ "-a"
});
e.expect("#0 .*third[^\r\n]*\\[inline\\]"
+ ".*#1 .*second[^\r\n]*\\[inline\\]"
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index f56cb87..53eea58 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ Changed CoreFileAtSignal to return core File instead of core Proc.
+ * TestWhereCommand.java: Updated.
+
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * TestWhereCommand.java: Reenabled tests.
+ Tests now use HpdCoreFileTestBed.
+ * HpdTestbed.java (HpdTestbed): Changed t protected
+ from private.
+ * HpdCoreFileTestbed.java: New file.
+
2007-11-08 Andrew Cagney <cagney@redhat.com>
* FocusCommand.java: Eliminate call to CLI.printUsage.
diff --git a/frysk-core/frysk/hpd/TestExamineCommand.java b/frysk-core/frysk/hpd/HpdCoreFileTestbed.java
similarity index 85%
copy from frysk-core/frysk/hpd/TestExamineCommand.java
copy to frysk-core/frysk/hpd/HpdCoreFileTestbed.java
index a51fcc3..b080f5f 100644
--- a/frysk-core/frysk/hpd/TestExamineCommand.java
+++ b/frysk-core/frysk/hpd/HpdCoreFileTestbed.java
@@ -39,17 +39,22 @@
package frysk.hpd;
+import java.io.File;
+
+import frysk.Config;
+
/**
- * Test parsing and printing of types.
+ * For fhpd tests that are based on core files.
*/
-
-public class TestExamineCommand
- extends TestLib
+public class HpdCoreFileTestbed
+ extends HpdTestbed
{
- public void testExamine () {
- e = HpdTestbed.attachXXX("hpd-c");
- // volatile int_22
- e.send ("examine static_char\n");
- e.expect ("examine.*5\r\n.*" + prompt);
+ public HpdCoreFileTestbed(File coreFile, File exeFile, String startup) {
+ super(new String[] {
+ Config.getBinFile("fhpd").getPath (),
+ coreFile.toString(),
+ exeFile.toString()
+ });
+ expectPrompt(startup);
}
}
diff --git a/frysk-core/frysk/hpd/HpdTestbed.java b/frysk-core/frysk/hpd/HpdTestbed.java
index 1ee6532..a6ccc73 100644
--- a/frysk-core/frysk/hpd/HpdTestbed.java
+++ b/frysk-core/frysk/hpd/HpdTestbed.java
@@ -63,7 +63,7 @@ public class HpdTestbed
*/
private final String prompt = "\\(fhpd\\) ";
- private HpdTestbed(String[] command) {
+ protected HpdTestbed(String[] command) {
super(command);
TearDownExpect.add(this);
TearDownProcess.add(getPid());
diff --git a/frysk-core/frysk/hpd/TestWhereCommand.java b/frysk-core/frysk/hpd/TestWhereCommand.java
index 1eca089..5cd4b2d 100644
--- a/frysk-core/frysk/hpd/TestWhereCommand.java
+++ b/frysk-core/frysk/hpd/TestWhereCommand.java
@@ -39,7 +39,9 @@
package frysk.hpd;
-import frysk.proc.Proc;
+import java.io.File;
+
+import frysk.Config;
import frysk.testbed.CoreFileAtSignal;
public class TestWhereCommand extends TestLib {
@@ -51,12 +53,12 @@ public class TestWhereCommand extends TestLib {
}
public void testFhpdVirtualStackTrace () {
- if(unresolved(5156)){
- return;
- }
- Proc proc = CoreFileAtSignal
+
+ File coreFile = CoreFileAtSignal
.constructCore("funit-inlined");
- e = new HpdTestbed("core." + proc.getPid(), "Attached to core file.*");
+ e = new HpdCoreFileTestbed(coreFile,
+ Config.getPkgLibFile("funit-inlined"),
+ "Attached to core file.*");
e.send("where\n");
e.expect("\\#0 .*third[^\\r\\n]*\\[inline\\]");
e.expect("\\#1 .*second[^\\r\\n]*\\[inline\\]");
@@ -66,12 +68,12 @@ public class TestWhereCommand extends TestLib {
}
public void testFhpdVirtualStackTraceWithScopes () {
- if(unresolved(5156)){
- return;
- }
- Proc proc = CoreFileAtSignal
+
+ File coreFile = CoreFileAtSignal
.constructCore("funit-inlined");
- e = new HpdTestbed("core." + proc.getPid(), "Attached to core file.*");
+ e = new HpdCoreFileTestbed(coreFile,
+ Config.getPkgLibFile("funit-inlined"),
+ "Attached to core file.*");
e.send("where -scopes\n");
e.expect(".*var3");
e.expect(".*var2");
diff --git a/frysk-core/frysk/testbed/ChangeLog b/frysk-core/frysk/testbed/ChangeLog
index 8dfcf8e..b58b912 100644
--- a/frysk-core/frysk/testbed/ChangeLog
+++ b/frysk-core/frysk/testbed/ChangeLog
@@ -1,3 +1,15 @@
+2007-11-09 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * CoreFileAtSignal.java (constructCore): Now return core file
+ instead of proc.
+ * TestCoreFileAtSignal.java (testCoreFileAtSignal): Updated.
+ Corrected path to executable.
+
+2007-11-08 Sami Wagiaalla <swagiaal@redhat.com>
+
+ * CoreFileAtSignal.java: Now passes executable path to core file
+ constructor.
+
2007-10-26 Mark Wielaard <mwielaard@redhat.com>
* RegsCase.java (IA32): Don't subtract one from EFLAGS bit mask.
diff --git a/frysk-core/frysk/testbed/CoreFileAtSignal.java b/frysk-core/frysk/testbed/CoreFileAtSignal.java
index 97c5faa..707f5b8 100644
--- a/frysk-core/frysk/testbed/CoreFileAtSignal.java
+++ b/frysk-core/frysk/testbed/CoreFileAtSignal.java
@@ -42,12 +42,9 @@ package frysk.testbed;
import java.io.File;
import frysk.event.Event;
-import frysk.proc.Host;
import frysk.proc.Manager;
import frysk.proc.Proc;
import frysk.proc.ProcBlockAction;
-import frysk.proc.ProcId;
-import frysk.proc.dead.LinuxHost;
import frysk.util.CoredumpAction;
public class CoreFileAtSignal extends TestLib {
@@ -58,7 +55,7 @@ public class CoreFileAtSignal extends TestLib {
* extracts a corefile at that point, and return a Proc representing
* that core file.
*/
- public static Proc constructCore(String process) {
+ public static File constructCore(String process) {
final Proc ackProc = (new DaemonBlockedAtSignal(process)).getMainTask().getProc();
@@ -78,11 +75,7 @@ public class CoreFileAtSignal extends TestLib {
File xtestCore = new File(coreFileName);
xtestCore.deleteOnExit();
- Host lcoreHost = new LinuxHost(Manager.eventLoop, xtestCore);
-
- Proc coreProc = lcoreHost.getProc(new ProcId(ackProc.getPid()));
-
- return coreProc;
+ return xtestCore;
}
}
diff --git a/frysk-core/frysk/testbed/TestCoreFileAtSignal.java b/frysk-core/frysk/testbed/TestCoreFileAtSignal.java
index 9127f0a..6246f26 100644
--- a/frysk-core/frysk/testbed/TestCoreFileAtSignal.java
+++ b/frysk-core/frysk/testbed/TestCoreFileAtSignal.java
@@ -39,11 +39,14 @@
package frysk.testbed;
+import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
+import frysk.Config;
import frysk.proc.Proc;
import frysk.stack.StackFactory;
+import frysk.util.Util;
public class TestCoreFileAtSignal extends TestLib
@@ -54,7 +57,9 @@ public class TestCoreFileAtSignal extends TestLib
return;
StringWriter stringWriter = new StringWriter();
- Proc coreProc = CoreFileAtSignal.constructCore(getExecPath("funit-stacks"));
+ File coreFile = CoreFileAtSignal.constructCore("funit-stacks");
+
+ Proc coreProc = Util.getProcFromCoreFile(coreFile, Config.getPkgLibFile("funit-stacks"));
StackFactory.printTaskStackTrace(new PrintWriter(stringWriter), coreProc
.getMainTask(), false);
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-11-09 15:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-09 15:28 [SCM] master: swagiaal: Changed CoreFileAtSignal to return core File instead of core Proc swagiaal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).