This is the mail archive of the
frysk-cvs@sources.redhat.com
mailing list for the frysk project.
[SCM] master: Enable TestFhpdStepping, new testbed and remove stepi/nexti. Fixes bug #4919.
- From: mark at sourceware dot org
- To: frysk-cvs at sourceware dot org
- Date: 18 Apr 2008 19:46:10 -0000
- Subject: [SCM] master: Enable TestFhpdStepping, new testbed and remove stepi/nexti. Fixes bug #4919.
- Reply-to: frysk at sourceware dot org
The branch, master has been updated
via 44f60a8d0ce962747244b9404a91ec96d9dda975 (commit)
from 1c65982254c28f61fc7b1fe47a74e93edf876953 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 44f60a8d0ce962747244b9404a91ec96d9dda975
Author: Mark Wielaard <mwielaard@redhat.com>
Date: Fri Apr 18 21:44:28 2008 +0200
Enable TestFhpdStepping, new testbed and remove stepi/nexti. Fixes bug #4919.
frysk-core/frysk/hpd/ChangeLog
2008-04-18 Mark Wielaard <mwielaard@redhat.com>
* TestFhpdStepping.java: Don't mark unresolved. Adjust to new
test environment and removal of stepi and nexti commands.
-----------------------------------------------------------------------
Summary of changes:
frysk-core/frysk/hpd/ChangeLog | 5 +++
frysk-core/frysk/hpd/TestFhpdStepping.java | 55 +++++++++-------------------
2 files changed, 22 insertions(+), 38 deletions(-)
First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index 633e5dc..bfe7075 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,5 +1,10 @@
2008-04-18 Mark Wielaard <mwielaard@redhat.com>
+ * TestFhpdStepping.java: Don't mark unresolved. Adjust to new
+ test environment and removal of stepi and nexti commands.
+
+2008-04-18 Mark Wielaard <mwielaard@redhat.com>
+
* TestDisplayCommand.java: Don't mark unresolved. Adjust to new
actionpoints -> actions command syntax.
diff --git a/frysk-core/frysk/hpd/TestFhpdStepping.java b/frysk-core/frysk/hpd/TestFhpdStepping.java
index 9fe1d35..89414df 100644
--- a/frysk-core/frysk/hpd/TestFhpdStepping.java
+++ b/frysk-core/frysk/hpd/TestFhpdStepping.java
@@ -50,28 +50,23 @@ public class TestFhpdStepping extends TestLib {
public void testInstructionStep () {
- if (unresolved(4914))
- return;
-
e = new HpdTestbed();
File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
this.scanner = new TestfileTokenScanner(source);
int startLine = this.scanner.findTokenLine("_instructionStep_");
- e = HpdTestbed.run("funit-stepping-asm");
-
- // Remove this - #4919 and #4914.
- try { Thread.sleep(2000); } catch (Exception e) {}
+ e = HpdTestbed.load("funit-stepping-asm");
+ e.send("start\n");
+ e.expect("starting with this commmand.*" + prompt);
e.send("break #" + source + "#" + startLine + "\n");
e.expect("breakpoint.*\n" + prompt);
- System.err.println("send go");
e.send("go\n");
e.expect("go.*\n" + prompt + "Breakpoint.*#*");
- e.send("stepi\n");
+ e.send("step --instruction\n");
e.expect("Task stopped at line " + startLine + ".*\n" + prompt);
e.send("quit\n");
@@ -81,18 +76,14 @@ public class TestFhpdStepping extends TestLib {
public void testLineStep () {
- if (unresolved(4914))
- return;
-
File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
this.scanner = new TestfileTokenScanner(source);
int startLine = this.scanner.findTokenLine("_instructionStep_");
int endLine = this.scanner.findTokenLine("_lineStepEnd_");
- e = HpdTestbed.run("funit-stepping-asm");
-
- // Remove this - #4919 and #4914.
- try { Thread.sleep(2000); } catch (Exception e) {}
+ e = HpdTestbed.load("funit-stepping-asm");
+ e.send("start\n");
+ e.expect("starting with this commmand.*" + prompt);
e.send("break #" + source + "#" + startLine + "\n");
e.expect("breakpoint.*\n" + prompt);
@@ -110,18 +101,14 @@ public class TestFhpdStepping extends TestLib {
public void testNextStep () {
- if (unresolved(4914))
- return;
-
File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
this.scanner = new TestfileTokenScanner(source);
int startLine = this.scanner.findTokenLine("_stepOverStart_");
int endLine = this.scanner.findTokenLine("_stepOverEnd_");
- e = HpdTestbed.run("funit-stepping-asm");
-
- // Remove this - #4919 and #4914.
- try { Thread.sleep(2000); } catch (Exception e) {}
+ e = HpdTestbed.load("funit-stepping-asm");
+ e.send("start\n");
+ e.expect("starting with this commmand.*" + prompt);
e.send("break #" + source + "#" + startLine + "\n");
e.expect("breakpoint.*\n" + prompt);
@@ -139,18 +126,14 @@ public class TestFhpdStepping extends TestLib {
public void testNextiStep () {
- if (unresolved(4914))
- return;
-
File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
this.scanner = new TestfileTokenScanner(source);
int startLine = this.scanner.findTokenLine("_stepOverStart_");
int endLine = this.scanner.findTokenLine("_stepOverEnd_");
- e = HpdTestbed.run("funit-stepping-asm");
-
- // Remove this - #4919 and #4914.
- try { Thread.sleep(2000); } catch (Exception e) {}
+ e = HpdTestbed.load("funit-stepping-asm");
+ e.send("start\n");
+ e.expect("starting with this commmand.*" + prompt);
e.send("break #" + source + "#" + startLine + "\n");
e.expect("breakpoint.*\n" + prompt);
@@ -158,7 +141,7 @@ public class TestFhpdStepping extends TestLib {
e.send("go\n");
e.expect("go.*\n" + prompt + "Breakpoint.*#*");
- e.send("nexti\n");
+ e.send("next --instruction\n");
e.expect("Task stopped at line " + endLine + ".*\n" + prompt);
e.send("quit\n");
@@ -168,18 +151,14 @@ public class TestFhpdStepping extends TestLib {
public void testFinishStep () {
- if (unresolved(4914))
- return;
-
File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
this.scanner = new TestfileTokenScanner(source);
int startLine = this.scanner.findTokenLine("_stepOutStart_");
int endLine = this.scanner.findTokenLine("_stepOverEnd_");
- e = HpdTestbed.run("funit-stepping-asm");
-
- // Remove this - #4919 and #4914.
- try { Thread.sleep(2000); } catch (Exception e) {}
+ e = HpdTestbed.load("funit-stepping-asm");
+ e.send("start\n");
+ e.expect("starting with this commmand.*" + prompt);
e.send("break #" + source + "#" + startLine + "\n");
e.expect("breakpoint.*\n" + prompt);
hooks/post-receive
--
frysk system monitor/debugger