[SCM] master: Merge branch 'master' of ssh://sourceware.org/git/frysk

[pzhao@sourceware.org]

The branch, master has been updated
       via  09eab2c9c52fbf13ed5d1c50a246868653fe7198 (commit)
       via  53364e361cad948dc4e34f2827e101b8e64b8df8 (commit)
      from  99e16d1871d3f7f834bdc8834b747591e01299a5 (commit)

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

- Log -----------------------------------------------------------------
commit 09eab2c9c52fbf13ed5d1c50a246868653fe7198
Merge: 53364e361cad948dc4e34f2827e101b8e64b8df8 99e16d1871d3f7f834bdc8834b747591e01299a5
Author: Zhao Shujing <pearly.zhao@oracle.com>
Date:   Tue Nov 27 23:14:19 2007 +0800

    Merge branch 'master' of ssh://sourceware.org/git/frysk

commit 53364e361cad948dc4e34f2827e101b8e64b8df8
Author: Zhao Shujing <pearly.zhao@oracle.com>
Date:   Tue Nov 27 23:05:41 2007 +0800

    Fix bug #5394
    
    frysk-core/frysk/proc/live/ChangeLog
    2007-11-22  Zhao shujing  <pearly.zhao@oracle.com>
    
           * TestByteBuffer.java (testMemoryBufferCapacity()): Fix bug 5394.

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

Summary of changes:
 frysk-core/frysk/proc/live/ChangeLog           |    4 ++++
 frysk-core/frysk/proc/live/TestByteBuffer.java |   24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/proc/live/ChangeLog b/frysk-core/frysk/proc/live/ChangeLog
index 0e8ba0d..30c52d9 100644
--- a/frysk-core/frysk/proc/live/ChangeLog
+++ b/frysk-core/frysk/proc/live/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-22  Zhao shujing  <pearly.zhao@oracle.com>
+
+	* TestByteBuffer.java (testMemoryBufferCapacity()): Fix bug 5394.
+
 2007-11-22  Andrew Cagney  <cagney@redhat.com>
 
 	* TestByteBuffer.java (testMemoryBufferCapacity()): Mark as
diff --git a/frysk-core/frysk/proc/live/TestByteBuffer.java b/frysk-core/frysk/proc/live/TestByteBuffer.java
index d8d8063..921b477 100644
--- a/frysk-core/frysk/proc/live/TestByteBuffer.java
+++ b/frysk-core/frysk/proc/live/TestByteBuffer.java
@@ -40,9 +40,14 @@
 package frysk.proc.live;
 
 import inua.eio.ByteBuffer;
+import frysk.isa.ISA;
 import frysk.junit.TestCase;
+import frysk.proc.Task;
 import frysk.testbed.AttachedSelf;
+import frysk.testbed.ExecCommand;
+import frysk.testbed.ExecOffspring;
 import frysk.testbed.LocalMemory;
+import frysk.testbed.TearDownFile;
 import frysk.sys.Ptrace.RegisterSet;
 import frysk.sys.Ptrace.AddressSpace;
 import frysk.proc.Manager;
@@ -58,13 +63,12 @@ public class TestByteBuffer
     private ByteBuffer[] addressBuffers;
     private ByteBuffer[] registerBuffers;
 
-    private ByteBuffer memorySpaceByteBuffer;
-
     public void setUp () throws Exception
     {
       int pid;
       ByteBuffer addressSpaceByteBufferText;
       ByteBuffer addressSpaceByteBufferData;
+      ByteBuffer memorySpaceByteBuffer;
       ByteBuffer usrByteBuffer;
       ByteBuffer registerByteBuffer;
       ByteBuffer fpregisterByteBuffer;
@@ -266,12 +270,22 @@ public class TestByteBuffer
 	  verifyPeeks(registerBuffers[i], addr, origBytes);
 	}
     }
-
     public void testMemoryBufferCapacity() {
 	if (unresolved(5394))
 	    return;
-	assertEquals("Memory Buffer Capacity: ", -1L,
-		     memorySpaceByteBuffer.capacity());
+	TearDownFile tmpFile = TearDownFile.create();
+	ExecOffspring child
+		= new ExecOffspring(new ExecCommand (new String[] {
+						 "/bin/rm",
+						 tmpFile.toString()
+					     }));
+	Task task = child.findTaskUsingRefresh(true);
+	if (task.getISA() == ISA.IA32)
+		assertEquals("Memory Buffer Capacity: ", 0xffffffffL,
+		     task.getMemory().capacity());
+	if (task.getISA() == ISA.X8664)
+		assertEquals("Memory Buffer Capacity: ", 0xffffffffffffffffL,
+                     task.getMemory().capacity());
     }
 
     private class AsyncPeeks


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