[SCM] master: Get all list tests to pass.

[scox@sourceware.org]

The branch, master has been updated
       via  2ec8b8634fd4699f0a5d3c602d50369a12e73355 (commit)
      from  2372e141f0c363c23be3131fe68d2d518fa1dea0 (commit)

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

- Log -----------------------------------------------------------------
commit 2ec8b8634fd4699f0a5d3c602d50369a12e73355
Author: Stan Cox <scox@redhat.com>
Date:   Tue Mar 18 14:29:26 2008 -0400

    Get all list tests to pass.
    
    * TestListCommand.java (testListPC): Set breakpoint via line number.
    Tighten up expect checks.
    (testListFrames): Likewise.
    * funit-quicksort.c (main): Make sortlist extern.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog               |    6 +++++
 frysk-core/frysk/hpd/TestListCommand.java    |   27 +++++++++++++------------
 frysk-core/frysk/pkglibdir/ChangeLog         |    4 +++
 frysk-core/frysk/pkglibdir/funit-quicksort.c |    4 +-
 4 files changed, 26 insertions(+), 15 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index c663336..94bf334 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-18  Stan Cox  <scox@redhat.com>
+
+	* TestListCommand.java (testListPC): Set breakpoint via line number.
+	Tighten up expect checks.
+	(testListFrames): Likewise.
+
 2008-03-17  Andrew Cagney  <cagney@redhat.com>
 
 	* TestSysRoot.java (testHaveSysRoot()): Mark as unresolved; bug
diff --git a/frysk-core/frysk/hpd/TestListCommand.java b/frysk-core/frysk/hpd/TestListCommand.java
index 7d5acae..e048c6d 100644
--- a/frysk-core/frysk/hpd/TestListCommand.java
+++ b/frysk-core/frysk/hpd/TestListCommand.java
@@ -52,27 +52,25 @@ public class TestListCommand extends TestLib {
     }
 
     public void testListPC() {
-	if (unresolved(5855))
-	    return;
 	e = new HpdTestbed();
 	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("start", "Attached to process.*");
-	e.sendCommandExpectPrompt("break main", "breakpoint.*");
+	e.sendCommandExpectPrompt("break #funit-quicksort.c#98", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
 	// Matching the list expected output is a trial and error process
 	// as the matching tends to be greedy.
 	e.send("list\n");
-	e.expect("88.*88.*littlest");
+	e.expect("88.*88.*littlest = sortlist");
 	e.expect("89.*89");
 	e.expect("90.*90");
-	e.expect("91.*91");
-	e.expect("92.*92.*int");
+	e.expect(".*91.*91.*int sortlist.element_count . 1.;");
+	e.expect("92.*92");
 	e.expect("93.*93.*main");
 	e.expect("94.*94.*{");
-	e.expect("95.*95.*sortlist");
-	e.expect("96.*96.*biggest");
+	e.expect("95.*95");
+	e.expect("96.*96.*biggest, littlest");
 	e.expect("97.*97");
 	e.expect("->  98.*98.*init_array");
 	e.expect("99.*99.*quicksort");
@@ -168,22 +166,25 @@ public class TestListCommand extends TestLib {
     }
 
     public void testListFrames() {
-	if (unresolved(5901))
-	  return;
-
 	e = new HpdTestbed();
 	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("start", "Attached to process.*");
-	e.sendCommandExpectPrompt("break bubblesort", "breakpoint.*");
+	e.sendCommandExpectPrompt("break #funit-bubblesort.c#49", "breakpoint.*");
         e.send("go\n");
         e.expect("go.*\n" + prompt + "Breakpoint");
 	e.send("list\n");
+	e.expect("39.*39");
+	e.expect("40.*40");
+	e.expect("41.*41");
+	e.expect("42.*42");
+	e.expect("43.*43");
+	e.expect("44.*44");
 	e.expect("45.*45");
 	e.expect("46.*46.*void");
 	e.expect("47.*47.*bubblesort");
 	e.expect("48.*48");
-	e.expect("->.*49.*49.*while");
+	e.expect(".*->  49.*49.*while");
 	e.expect("50.*50");
 	e.expect("51.*51.*int i");
 	e.expect("52.*52.*int j");
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index 3bcd3e2..7ec6e15 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-18  Stan Cox  <scox@redhat.com>
+
+	* funit-quicksort.c (main): Make sortlist extern.
+
 2008-03-14  Andrew Cagney  <cagney@redhat.com>
 
 	* fparser.xml, fparser.java: Move to here from frysk.bindir.
diff --git a/frysk-core/frysk/pkglibdir/funit-quicksort.c b/frysk-core/frysk/pkglibdir/funit-quicksort.c
index 0fd4569..cba93a9 100644
--- a/frysk-core/frysk/pkglibdir/funit-quicksort.c
+++ b/frysk-core/frysk/pkglibdir/funit-quicksort.c
@@ -88,11 +88,11 @@
 /* 88 */ 	*littlest = sortlist[i];
 /* 89 */     }
 /* 90 */ }
-/* 91 */ 
+/* 91 */ int sortlist[element_count + 1];
 /* 92 */ int
 /* 93 */ main()
 /* 94 */ {
-/* 95 */   int sortlist[element_count + 1];
+/* 95 */
 /* 96 */   int biggest, littlest;
 /* 97 */ 
 /* 98 */   init_array (sortlist, &littlest, &biggest);


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