From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18585 invoked by alias); 13 Dec 2007 20:18:50 -0000 Received: (qmail 18559 invoked by uid 9519); 13 Dec 2007 20:18:49 -0000 Date: Thu, 13 Dec 2007 20:18:00 -0000 Message-ID: <20071213201849.18544.qmail@sourceware.org> From: rmoseley@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Merge branch 'master' of ssh://sources.redhat.com/git/frysk X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4efeffcfb597768d5805de8a5b7093451c2fc392 X-Git-Newrev: b75c309191bc0edf60db7b51ddf9c056f720fc86 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: 2007-q4/txt/msg00587.txt.bz2 The branch, master has been updated via b75c309191bc0edf60db7b51ddf9c056f720fc86 (commit) via aca79501ae7e79668cf06fdc3eeab7482d2cf60e (commit) from 4efeffcfb597768d5805de8a5b7093451c2fc392 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit b75c309191bc0edf60db7b51ddf9c056f720fc86 Merge: aca79501ae7e79668cf06fdc3eeab7482d2cf60e 4efeffcfb597768d5805de8a5b7093451c2fc392 Author: Rick Moseley Date: Thu Dec 13 14:18:30 2007 -0600 Merge branch 'master' of ssh://sources.redhat.com/git/frysk commit aca79501ae7e79668cf06fdc3eeab7482d2cf60e Author: Rick Moseley Date: Thu Dec 13 14:17:56 2007 -0600 Remove part of TestLoadCommand that is no longer valid. * TestLoadCommand.java: Remove part of TestLoadCommand that is no longer valid. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/hpd/ChangeLog | 4 ++++ frysk-core/frysk/hpd/TestLoadCommand.java | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index eca9cb0..2e671e9 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,3 +1,7 @@ +2007-12-13 Rick Moseley + + * TestLoadCommand.java: Remove part of test no longer valid. + 2007-12-13 Phil Muldoon * AuxvCommand.java (interpret): Check for null auxv data. diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java index cc709b6..8830150 100644 --- a/frysk-core/frysk/hpd/TestLoadCommand.java +++ b/frysk-core/frysk/hpd/TestLoadCommand.java @@ -99,8 +99,6 @@ public class TestLoadCommand extends TestLib { e.send("run\n"); e.expect(5, "Attached to process*"); e.expect(5, "Attached to process*"); - e.send("run\n"); - e.expect(5, "Error: missing program"); e.close(); } } hooks/post-receive -- frysk system monitor/debugger