From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6240 invoked by alias); 17 Mar 2008 17:33:23 -0000 Received: (qmail 6207 invoked by uid 9514); 17 Mar 2008 17:33:18 -0000 Date: Mon, 17 Mar 2008 17:33:00 -0000 Message-ID: <20080317173318.6191.qmail@sourceware.org> From: pmuldoon@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: 2008-03-17 Phil Muldoon X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ec2bf1299f4d201f2452558aafd0880c680c729c X-Git-Newrev: d8919fbb113772ebc987e74061e838879556d9c4 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00388.txt.bz2 The branch, master has been updated via d8919fbb113772ebc987e74061e838879556d9c4 (commit) from ec2bf1299f4d201f2452558aafd0880c680c729c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit d8919fbb113772ebc987e74061e838879556d9c4 Author: Phil Muldoon Date: Mon Mar 17 17:33:00 2008 +0000 2008-03-17 Phil Muldoon * TestCorefileByteBuffer.java (testCorefileByteBufferSlice): Use getBytes(). Test for null returns. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/proc/dead/ChangeLog | 5 ++++- .../frysk/proc/dead/TestCorefileByteBuffer.java | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog index 9229a67..4f8ff90 100644 --- a/frysk-core/frysk/proc/dead/ChangeLog +++ b/frysk-core/frysk/proc/dead/ChangeLog @@ -1,5 +1,8 @@ -2008-03-17 Andrew Cagney +2008-03-17 Phil Muldoon + * TestCorefileByteBuffer.java (testCorefileByteBufferSlice): Use + getBytes(). Test for null returns. +2008-03-17 Andrew Cagney * DeadHost.java: Update; using TaskAttachedObserverXXX; * TestLinuxCore.java: Update. * DeadTask.java: Ditto. diff --git a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java index 1c2d3d2..aafe4bd 100644 --- a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java +++ b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java @@ -57,7 +57,7 @@ public class TestCorefileByteBuffer public void testCorefileByteBufferSlice() throws ElfException { - ElfData rawData; + ElfData rawData = null; final long sliceBottom = 0x411bb000L; final long sliceTop = 0x411bbfffL; final long elfOffset = 0x28000; @@ -74,16 +74,18 @@ public class TestCorefileByteBuffer // Independently get the elf core data as a raw image Elf segment = new Elf(Config.getPkgDataFile("test-core-x86"), ElfCommand.ELF_C_READ); + assertNotNull("Get Elf file for segment inspection", segment); rawData = segment.getRawData(elfOffset,elfLen); + assertNotNull("RawData is not null", rawData); + byte[] byteSet = rawData.getBytes(); // coreSlice.position(sliceBottom); for(int i=0; i