From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22747 invoked by alias); 17 Apr 2008 18:41:37 -0000 Received: (qmail 22720 invoked by uid 367); 17 Apr 2008 18:41:37 -0000 Date: Thu, 17 Apr 2008 18:41:00 -0000 Message-ID: <20080417184137.22705.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete Config's .getHomeDir() and .getPkgLibFile(String). X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 45a781515286e1728edaae497713aa46b2312c26 X-Git-Newrev: 35624ff9b23a0d4113a5f41f3840d600aacda7df 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-q2/txt/msg00130.txt.bz2 The branch, master has been updated via 35624ff9b23a0d4113a5f41f3840d600aacda7df (commit) from 45a781515286e1728edaae497713aa46b2312c26 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 35624ff9b23a0d4113a5f41f3840d600aacda7df Author: Andrew Cagney Date: Thu Apr 17 14:38:54 2008 -0400 Delete Config's .getHomeDir() and .getPkgLibFile(String). frysk-core/frysk/dwfl/ChangeLog 2008-04-17 Andrew Cagney * TestElfSectionCache.java: Use frysk.config.Prefix. frysk-core/frysk/ftrace/ChangeLog 2008-04-17 Andrew Cagney * TestMappingGuard.java: Use frysk.config.Prefix. frysk-core/frysk/hpd/ChangeLog 2008-04-17 Andrew Cagney * TestBreakpoints.java: Use frysk.config.Prefix. * TestWatchCommand.java: Ditto. * TestSysRoot.java: Ditto. * TestStartCommand.java: Ditto. * TestRunCommand.java: Ditto. * TestRegs.java: Ditto. * TestListCommand.java: Ditto. * TestKillCommand.java: Ditto. * TestHpdTestHarness.java: Ditto. * TestGoCommand.java: Ditto. * TestGenerateCoreCommand.java: Ditto. * TestCompletionFactory.java: Ditto. * TestEvalCommands.java: Ditto. frysk-core/frysk/proc/ChangeLog 2008-04-17 Andrew Cagney * StressAttachDetachSignaledTask.java: Use frysk.config.Prefix. * TestTaskSyscallObserver.java: Ditto. * TestTaskObserverWatchpoint.java: Ditto. * TestTaskObserverInstructionSigReturn.java: Ditto. * TestTaskObserverInstruction.java: Ditto. * TestSyscallSignal.java: Ditto. * TestSyscallRunning.java: Ditto. * TestBreakpoints.java: Ditto. frysk-core/frysk/stack/ChangeLog 2008-04-17 Andrew Cagney * TestFrame.java: Use frysk.config.Prefix. frysk-core/frysk/sysroot/ChangeLog 2008-04-17 Andrew Cagney * TestSysRoot.java: Use frysk.config.Prefix. frysk-core/frysk/util/ChangeLog 2008-04-17 Andrew Cagney * TestCommandlineParser.java: Use frysk.config.Prefix. frysk-sys/frysk/config/ChangeLog 2008-04-17 Andrew Cagney * Config.java (getPkgLibFile(String)): Delete. (getHomeDir()): Delete. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/dwfl/ChangeLog | 4 +++ frysk-core/frysk/dwfl/TestElfSectionCache.java | 4 +- frysk-core/frysk/ftrace/ChangeLog | 4 +++ frysk-core/frysk/ftrace/TestMappingGuard.java | 4 +- frysk-core/frysk/hpd/ChangeLog | 14 +++++++++++ frysk-core/frysk/hpd/TestBreakpoints.java | 10 ++++---- frysk-core/frysk/hpd/TestCompletionFactory.java | 4 +- frysk-core/frysk/hpd/TestEvalCommands.java | 4 +- frysk-core/frysk/hpd/TestGenerateCoreCommand.java | 10 ++++---- frysk-core/frysk/hpd/TestGoCommand.java | 8 +++--- frysk-core/frysk/hpd/TestHpdTestHarness.java | 4 +- frysk-core/frysk/hpd/TestKillCommand.java | 12 ++++---- frysk-core/frysk/hpd/TestListCommand.java | 12 ++++---- frysk-core/frysk/hpd/TestRegs.java | 4 +- frysk-core/frysk/hpd/TestRunCommand.java | 24 +++++++++--------- frysk-core/frysk/hpd/TestStartCommand.java | 16 ++++++------ frysk-core/frysk/hpd/TestSysRoot.java | 6 ++-- frysk-core/frysk/hpd/TestWatchCommand.java | 4 +- frysk-core/frysk/proc/ChangeLog | 11 ++++++++ .../frysk/proc/StressAttachDetachSignaledTask.java | 4 +- frysk-core/frysk/proc/TestBreakpoints.java | 4 +- frysk-core/frysk/proc/TestSyscallRunning.java | 4 +- frysk-core/frysk/proc/TestSyscallSignal.java | 4 +- .../frysk/proc/TestTaskObserverInstruction.java | 4 +- .../proc/TestTaskObserverInstructionSigReturn.java | 4 +- .../frysk/proc/TestTaskObserverWatchpoint.java | 12 ++++---- frysk-core/frysk/proc/TestTaskSyscallObserver.java | 6 ++-- frysk-core/frysk/stack/ChangeLog | 4 +++ frysk-core/frysk/stack/TestFrame.java | 6 ++-- frysk-core/frysk/sysroot/ChangeLog | 4 +++ frysk-core/frysk/sysroot/TestSysRoot.java | 8 +++--- frysk-core/frysk/util/ChangeLog | 4 +++ frysk-core/frysk/util/TestCommandlineParser.java | 4 +- frysk-sys/frysk/config/ChangeLog | 3 ++ frysk-sys/frysk/config/Config.java | 25 +++++++------------ 35 files changed, 150 insertions(+), 109 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/dwfl/ChangeLog b/frysk-core/frysk/dwfl/ChangeLog index b9be447..74753ad 100644 --- a/frysk-core/frysk/dwfl/ChangeLog +++ b/frysk-core/frysk/dwfl/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 Andrew Cagney + + * TestElfSectionCache.java: Use frysk.config.Prefix. + 2008-04-03 Petr Machata * ObjectFile.java: Moved from frysk.ftrace diff --git a/frysk-core/frysk/dwfl/TestElfSectionCache.java b/frysk-core/frysk/dwfl/TestElfSectionCache.java index 0049a2c..729b28b 100644 --- a/frysk-core/frysk/dwfl/TestElfSectionCache.java +++ b/frysk-core/frysk/dwfl/TestElfSectionCache.java @@ -40,7 +40,7 @@ package frysk.dwfl; import lib.dwfl.ElfSectionHeader; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.proc.Task; import frysk.testbed.DaemonBlockedAtEntry; import frysk.testbed.TestLib; @@ -49,7 +49,7 @@ public class TestElfSectionCache extends TestLib { public void testGetSectionHeader() { - DaemonBlockedAtEntry dbae = new DaemonBlockedAtEntry(Config.getPkgLibFile("funit-libcall")); + DaemonBlockedAtEntry dbae = new DaemonBlockedAtEntry(Prefix.pkgLibFile("funit-libcall")); Task task = dbae.getMainTask(); long addr = task.getPC(); diff --git a/frysk-core/frysk/ftrace/ChangeLog b/frysk-core/frysk/ftrace/ChangeLog index 7ea8677..cd81538 100644 --- a/frysk-core/frysk/ftrace/ChangeLog +++ b/frysk-core/frysk/ftrace/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 Andrew Cagney + + * TestMappingGuard.java: Use frysk.config.Prefix. + 2008-04-16 Mark Wielaard * TaskTracer.java (getReturnAddress): Fetch the return address diff --git a/frysk-core/frysk/ftrace/TestMappingGuard.java b/frysk-core/frysk/ftrace/TestMappingGuard.java index 4eb4178..3125642 100644 --- a/frysk-core/frysk/ftrace/TestMappingGuard.java +++ b/frysk-core/frysk/ftrace/TestMappingGuard.java @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.regex.Pattern; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.dwfl.ObjectFile; import frysk.proc.Action; import frysk.proc.Manager; @@ -91,7 +91,7 @@ public class TestMappingGuard } } - String[] cmd = {Config.getPkgLibFile("funit-empty").getPath()}; + String[] cmd = {Prefix.pkgLibFile("funit-empty").getPath()}; DaemonBlockedAtEntry child = new DaemonBlockedAtEntry(cmd); Task task = child.getMainTask(); diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog index 075a298..e468416 100644 --- a/frysk-core/frysk/hpd/ChangeLog +++ b/frysk-core/frysk/hpd/ChangeLog @@ -1,5 +1,19 @@ 2008-04-17 Andrew Cagney + * TestBreakpoints.java: Use frysk.config.Prefix. + * TestWatchCommand.java: Ditto. + * TestSysRoot.java: Ditto. + * TestStartCommand.java: Ditto. + * TestRunCommand.java: Ditto. + * TestRegs.java: Ditto. + * TestListCommand.java: Ditto. + * TestKillCommand.java: Ditto. + * TestHpdTestHarness.java: Ditto. + * TestGoCommand.java: Ditto. + * TestGenerateCoreCommand.java: Ditto. + * TestCompletionFactory.java: Ditto. + * TestEvalCommands.java: Ditto. + * HpdTestbed.java: Use frysk.config.Prefix. * TestPeekCommand.java: Ditto. * TestCoreCommand.java: Ditto. diff --git a/frysk-core/frysk/hpd/TestBreakpoints.java b/frysk-core/frysk/hpd/TestBreakpoints.java index 79acafd..3cb0ecc 100644 --- a/frysk-core/frysk/hpd/TestBreakpoints.java +++ b/frysk-core/frysk/hpd/TestBreakpoints.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; public class TestBreakpoints extends TestLib @@ -60,7 +60,7 @@ public class TestBreakpoints public void testHpdBreakpointRunProcess() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("hpd-c").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("hpd-c").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); // Break @@ -121,7 +121,7 @@ public class TestBreakpoints if (unresolved(5351)) return; e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-fib-clone").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-fib-clone").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start 3", "Attached to process.*"); // Break @@ -150,7 +150,7 @@ public class TestBreakpoints return; } e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-fib-clone").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-fib-clone").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start 3", "Attached to process.*"); // Break @@ -190,7 +190,7 @@ public class TestBreakpoints public void testBreakOnStructMemberName() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-structmember").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-structmember").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.send("break testfn\n"); diff --git a/frysk-core/frysk/hpd/TestCompletionFactory.java b/frysk-core/frysk/hpd/TestCompletionFactory.java index 362b0fe..509ae74 100644 --- a/frysk-core/frysk/hpd/TestCompletionFactory.java +++ b/frysk-core/frysk/hpd/TestCompletionFactory.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; public class TestCompletionFactory extends TestLib { @@ -54,7 +54,7 @@ public class TestCompletionFactory extends TestLib { * also be .o files, but ignore that. */ private void checkFunitStackCompletion() { - e.send(Config.getPkgLibFile("funit-stack-").getAbsolutePath()); + e.send(Prefix.pkgLibFile("funit-stack-").getAbsolutePath()); e.send("\t"); e.expect("funit-stack-inlined\\r\\n"); e.expect("funit-stack-outlined\\r\\n"); diff --git a/frysk-core/frysk/hpd/TestEvalCommands.java b/frysk-core/frysk/hpd/TestEvalCommands.java index 6763679..8ce0455 100644 --- a/frysk-core/frysk/hpd/TestEvalCommands.java +++ b/frysk-core/frysk/hpd/TestEvalCommands.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.FryskAsm; import frysk.isa.ISA; import frysk.isa.registers.Register; @@ -98,7 +98,7 @@ public class TestEvalCommands extends TestLib { public void testRegister() { // FIXME: Should use funit-regs. e = HpdTestbed.attachXXX("hpd-c"); - File exe = Config.getPkgLibFile("hpd-c"); + File exe = Prefix.pkgLibFile("hpd-c"); ISA isa = ElfMap.getISA(exe); Register r = FryskAsm.createFryskAsm(isa).REG0; e.sendCommandExpectPrompt("print $" + r.getName() + " -format d", diff --git a/frysk-core/frysk/hpd/TestGenerateCoreCommand.java b/frysk-core/frysk/hpd/TestGenerateCoreCommand.java index 5f51fb2..a48c19d 100644 --- a/frysk-core/frysk/hpd/TestGenerateCoreCommand.java +++ b/frysk-core/frysk/hpd/TestGenerateCoreCommand.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.expunit.EndOfFileException; import frysk.expunit.Match; import frysk.expunit.Regex; @@ -57,7 +57,7 @@ public class TestGenerateCoreCommand extends TestLib { public void testGenerateCoreCommand() { HpdTestbed h = new HpdTestbed(); - h.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + h.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "Loaded executable file.*"); h.sendCommandExpectPrompt("start", "Attached to process.*"); h.send("dump\n"); @@ -83,7 +83,7 @@ public class TestGenerateCoreCommand extends TestLib { public void testGenerateCoreAllMapsCommand() { HpdTestbed h = new HpdTestbed(); - h.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + h.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "Loaded executable file.*"); h.sendCommandExpectPrompt("start", "Attached to process.*"); h.send("dump -a\n"); @@ -109,7 +109,7 @@ public class TestGenerateCoreCommand extends TestLib { public void testGenerateRenamedCoreCommand() { HpdTestbed h = new HpdTestbed(); - h.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + h.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "Loaded executable file.*"); h.sendCommandExpectPrompt("start 1", "Attached to process.*"); h.send("dump -o testname\n"); @@ -135,7 +135,7 @@ public class TestGenerateCoreCommand extends TestLib { public void testGenerateRenamedAllMapsCoreCommand() { HpdTestbed h = new HpdTestbed(); - h.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-fib-clone").getPath(), + h.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-fib-clone").getPath(), "Loaded executable file.*"); h.sendCommandExpectPrompt("start 1", "Attached to process.*"); h.send("dump -a -o testname\n"); diff --git a/frysk-core/frysk/hpd/TestGoCommand.java b/frysk-core/frysk/hpd/TestGoCommand.java index 7bd9190..ec066b6 100644 --- a/frysk-core/frysk/hpd/TestGoCommand.java +++ b/frysk-core/frysk/hpd/TestGoCommand.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; /** * This class tests the "go" command and makes sure it does not blow up @@ -49,7 +49,7 @@ import frysk.config.Config; public class TestGoCommand extends TestLib { public void testGoCommand() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); //e.sendCommandExpectPrompt("run ", // "Attached to process ([0-9]+).*Running process ([0-9]+).*"); @@ -66,7 +66,7 @@ public class TestGoCommand extends TestLib { */ public void testGoCommandError() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("go", "Error: Cannot use.*"); e.send("quit\n"); @@ -82,7 +82,7 @@ public class TestGoCommand extends TestLib { */ /* public void testGoCommandErrorTwo() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("run", "Attached to process.*Running process.*"); e.sendCommandExpectPrompt("go", "Error: Cannot use.*"); diff --git a/frysk-core/frysk/hpd/TestHpdTestHarness.java b/frysk-core/frysk/hpd/TestHpdTestHarness.java index b8eece1..a68763d 100644 --- a/frysk-core/frysk/hpd/TestHpdTestHarness.java +++ b/frysk-core/frysk/hpd/TestHpdTestHarness.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; public class TestHpdTestHarness extends TestLib { public void testKillHpdTestHarness() { @@ -49,7 +49,7 @@ public class TestHpdTestHarness extends TestLib { e = new HpdTestbed(); //e.send("load " + Config.getPkgLibFile("funit-threads-looper").getPath() // + "\n"); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); //e.expect("Loaded executable file.*"); e.send("run\n"); diff --git a/frysk-core/frysk/hpd/TestKillCommand.java b/frysk-core/frysk/hpd/TestKillCommand.java index b6a9adb..4a5446c 100644 --- a/frysk-core/frysk/hpd/TestKillCommand.java +++ b/frysk-core/frysk/hpd/TestKillCommand.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.SlaveOffspring; /** @@ -59,7 +59,7 @@ public class TestKillCommand extends TestLib { } */ e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("run", "Attached to process.*"); @@ -119,7 +119,7 @@ public class TestKillCommand extends TestLib { if (unresolved(5615)) return; e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("run", "Attached to process.*"); @@ -145,7 +145,7 @@ public class TestKillCommand extends TestLib { */ public void testLoadKill() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("run", "Attached to process.*"); e.sendCommandExpectPrompt("kill", "Killing process.*"); @@ -222,9 +222,9 @@ java.lang.NullPointerException */ public void testKillHpd() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "Loaded executable file.*"); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("run", "Attached to process.*"); try { Thread.sleep(500); } catch (Exception e) { } diff --git a/frysk-core/frysk/hpd/TestListCommand.java b/frysk-core/frysk/hpd/TestListCommand.java index 8051e8f..5b9e337 100644 --- a/frysk-core/frysk/hpd/TestListCommand.java +++ b/frysk-core/frysk/hpd/TestListCommand.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; /** * Test the functionality of the alias and unalias commands. @@ -53,7 +53,7 @@ public class TestListCommand extends TestLib { public void testListPC() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-quicksort").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.sendCommandExpectPrompt("break #funit-quicksort.c#98", "breakpoint.*"); @@ -83,7 +83,7 @@ public class TestListCommand extends TestLib { public void testListFunction() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-quicksort").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.sendCommandExpectPrompt("break main", "breakpoint.*"); @@ -130,7 +130,7 @@ public class TestListCommand extends TestLib { public void testListReverse() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-quicksort").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.sendCommandExpectPrompt("break main", "breakpoint.*"); @@ -169,7 +169,7 @@ public class TestListCommand extends TestLib { public void testListFrames() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-quicksort").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.sendCommandExpectPrompt("break #funit-bubblesort.c#49", "breakpoint.*"); @@ -238,7 +238,7 @@ public class TestListCommand extends TestLib { public void testListErrors() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-quicksort").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-quicksort").getPath(), "Loaded executable file.*"); e.sendCommandExpectPrompt("start", "Attached to process.*"); e.sendCommandExpectPrompt("break main", "breakpoint.*"); diff --git a/frysk-core/frysk/hpd/TestRegs.java b/frysk-core/frysk/hpd/TestRegs.java index 96f1b35..c571187 100644 --- a/frysk-core/frysk/hpd/TestRegs.java +++ b/frysk-core/frysk/hpd/TestRegs.java @@ -39,7 +39,7 @@ package frysk.hpd; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.isa.ISA; import java.io.File; import frysk.isa.ElfMap; @@ -48,7 +48,7 @@ public class TestRegs extends TestLib { public void testRegsCommand() { e = HpdTestbed.attachXXX("hpd-c"); - File exe = Config.getPkgLibFile("hpd-c"); + File exe = Prefix.pkgLibFile("hpd-c"); ISA isa = ElfMap.getISA(exe); String[] commandSet = {"regs\n", "info general-regs\n"}; diff --git a/frysk-core/frysk/hpd/TestRunCommand.java b/frysk-core/frysk/hpd/TestRunCommand.java index 7513d35..2b3b8ce 100644 --- a/frysk-core/frysk/hpd/TestRunCommand.java +++ b/frysk-core/frysk/hpd/TestRunCommand.java @@ -43,7 +43,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.FileNotFoundException; -import frysk.config.Config; +import frysk.config.Prefix; /** * This class tests the "run" command. @@ -52,7 +52,7 @@ import frysk.config.Config; public class TestRunCommand extends TestLib { public void testRunCommand() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "\\[0\\.0\\] Loaded executable file.*"); e.sendCommandExpectPrompt("run ", "Attached to process ([0-9]+).*Running process ([0-9]+).*"); @@ -72,12 +72,12 @@ public class TestRunCommand extends TestLib { if (unresolved(5615)) return; e = new HpdTestbed(); - e.send("load " + Config.getPkgLibFile("funit-threads-looper").getPath() + "\n"); + e.send("load " + Prefix.pkgLibFile("funit-threads-looper").getPath() + "\n"); e.expect("\\[0\\.0\\] Loaded executable file.*" + prompt); e.send("run\n"); e.expect("Attached to process ([0-9]+).*"); e.expect("Running process ([0-9]+).*" + prompt); - //e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + //e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), //"Loaded executable file.*"); //e.sendCommandExpectPrompt("run ", // "Attached to process ([0-9]+).*Running process ([0-9]+).*"); @@ -99,7 +99,7 @@ public class TestRunCommand extends TestLib { public void testRunCommandParameter() { e = new HpdTestbed(); String[] param = { "-testing", "parameter2", "-g"}; - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-parameters").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-parameters").getPath(), "\\[0\\.0\\] Loaded executable file.*"); String parameters = ""; for (int i = 0; i < param.length; i++) { @@ -150,9 +150,9 @@ public class TestRunCommand extends TestLib { if (unresolved(5984)) return; e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "\\[0\\.0\\] Loaded executable file.*"); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "\\[1\\.0\\] Loaded executable file.*"); e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*"+ "\\[1\\.0\\]\t\t0*\\t0.*"); @@ -176,9 +176,9 @@ public class TestRunCommand extends TestLib { public void testRunFocus() { e = new HpdTestbed(); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(), "\\[0\\.0\\] Loaded executable file.*"); - e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-threads-looper").getPath(), + e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(), "\\[1\\.0\\] Loaded executable file.*"); e.sendCommandExpectPrompt("focus [1.0]", "Creating new HPD notation set.*"); e.sendCommandExpectPrompt("run", "Attached to process ([0-9]+).*" + @@ -196,11 +196,11 @@ public class TestRunCommand extends TestLib { hooks/post-receive -- frysk system monitor/debugger