public inbox for frysk-cvs@sourceware.org help / color / mirror / Atom feed
From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Delete redundant Config's getPkgLib64File, getPkgLib32File, getImagesDir. Date: Thu, 17 Apr 2008 14:51:00 -0000 [thread overview] Message-ID: <20080417145109.22513.qmail@sourceware.org> (raw) The branch, master has been updated via bafe331e7bc63d1e3ea34f1282602a9ff51ba1d3 (commit) from d474092b293ca62c489a400a0848c09045ef7ca4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit bafe331e7bc63d1e3ea34f1282602a9ff51ba1d3 Author: Andrew Cagney <cagney@redhat.com> Date: Thu Apr 17 10:48:35 2008 -0400 Delete redundant Config's getPkgLib64File, getPkgLib32File, getImagesDir. frysk-core/frysk/bindir/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestFauxv.java: Use frysk.config.Prefix. * TestFtrace.java: Ditto. * TestFstep.java: Ditto. * TestFmaps.java: Ditto. * TestFhpd.java: Ditto. * TestFexe.java: Ditto. * TestFerror.java: Ditto. * TestFdebuginfo.java: Ditto. * TestFcore.java: Ditto. frysk-core/frysk/dom/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestParser.java: Use frysk.config.Prefix. frysk-core/frysk/isa/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestISA.java: Use frysk.config.Prefix. frysk-core/frysk/testbed/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * FunitThreadsOffspring.java: Use frysk.config.Prefix. * SlaveOffspring.java: Ditto. * TestLib.java: Ditto. * CorefileFactory.java: Ditto. * IsaTestbed.java: Ditto. * TestStopEventLoopWhenProcTerminates.java: Ditto. * ExecCommand.java: Ditto. * LegacyOffspring.java: Ditto. * DaemonBlockedAtEntry.java: Ditto. * TestCorefileFactory.java: Ditto. frysk-gui/frysk/gui/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * disassembler/DisassemblyWindowFactory.java: Use frysk.config.Prefix. frysk-gui/frysk/gui/common/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * IconManager.java: Use frysk.config.Prefix. frysk-sys/frysk/config/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * Config.java (getPkgLib64File(String)): Delete. (getPkgLib32File(String)): Delete. (getImagesDir()): Delete. frysk-sys/frysk/junit/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestCase.java: Use frysk.config.Prefix. frysk-sys/frysk/sys/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestFork.java: Use frysk.config.Prefix. * TestPipePair.java: Ditto. frysk-sys/lib/dwfl/ChangeLog 2008-04-17 Andrew Cagney <cagney@redhat.com> * TestElf.java: Use frysk.config.Prefix. ----------------------------------------------------------------------- Summary of changes: frysk-core/frysk/bindir/ChangeLog | 12 +++++++ frysk-core/frysk/bindir/TestFauxv.java | 6 ++-- frysk-core/frysk/bindir/TestFcore.java | 12 +++--- frysk-core/frysk/bindir/TestFdebuginfo.java | 10 +++--- frysk-core/frysk/bindir/TestFerror.java | 16 +++++----- frysk-core/frysk/bindir/TestFexe.java | 8 ++-- frysk-core/frysk/bindir/TestFhpd.java | 14 ++++---- frysk-core/frysk/bindir/TestFmaps.java | 6 ++-- frysk-core/frysk/bindir/TestFstep.java | 6 ++-- frysk-core/frysk/bindir/TestFtrace.java | 12 +++--- frysk-core/frysk/dom/ChangeLog | 4 ++ frysk-core/frysk/dom/TestParser.java | 6 ++-- frysk-core/frysk/isa/ChangeLog | 4 ++ frysk-core/frysk/isa/TestISA.java | 8 ++-- .../frysk/isa/watchpoints/TestWatchpoint.java | 4 +- frysk-core/frysk/testbed/ChangeLog | 13 +++++++ frysk-core/frysk/testbed/CorefileFactory.java | 4 +- frysk-core/frysk/testbed/DaemonBlockedAtEntry.java | 4 +- frysk-core/frysk/testbed/ExecCommand.java | 10 +++--- .../frysk/testbed/FunitThreadsOffspring.java | 4 +- frysk-core/frysk/testbed/IsaTestbed.java | 8 ++-- frysk-core/frysk/testbed/LegacyOffspring.java | 4 +- frysk-core/frysk/testbed/SlaveOffspring.java | 4 +- frysk-core/frysk/testbed/TestCorefileFactory.java | 4 +- frysk-core/frysk/testbed/TestIsa.java | 8 ++-- frysk-core/frysk/testbed/TestLib.java | 4 +- .../TestStopEventLoopWhenProcTerminates.java | 4 +- frysk-gui/frysk/gui/ChangeLog | 5 +++ frysk-gui/frysk/gui/common/ChangeLog | 4 ++ frysk-gui/frysk/gui/common/IconManager.java | 34 ++++++++++---------- .../gui/disassembler/DisassemblyWindowFactory.java | 4 +- frysk-sys/frysk/config/ChangeLog | 6 +++ frysk-sys/frysk/config/Config.java | 33 ------------------- frysk-sys/frysk/junit/ChangeLog | 4 ++ frysk-sys/frysk/junit/TestCase.java | 12 +++--- frysk-sys/frysk/sys/ChangeLog | 5 +++ frysk-sys/frysk/sys/TestFork.java | 4 +- frysk-sys/frysk/sys/TestPipePair.java | 4 +- frysk-sys/lib/dwfl/ChangeLog | 4 ++ frysk-sys/lib/dwfl/TestElf.java | 26 +++++++------- 40 files changed, 186 insertions(+), 158 deletions(-) First 500 lines of diff: diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog index 5b485a7..095bb5f 100644 --- a/frysk-core/frysk/bindir/ChangeLog +++ b/frysk-core/frysk/bindir/ChangeLog @@ -1,3 +1,15 @@ +2008-04-17 Andrew Cagney <cagney@redhat.com> + + * TestFauxv.java: Use frysk.config.Prefix. + * TestFtrace.java: Ditto. + * TestFstep.java: Ditto. + * TestFmaps.java: Ditto. + * TestFhpd.java: Ditto. + * TestFexe.java: Ditto. + * TestFerror.java: Ditto. + * TestFdebuginfo.java: Ditto. + * TestFcore.java: Ditto. + 2008-04-16 Andrew Cagney <cagney@redhat.com> * TestFstack.java: Use frysk.config.Prefix. diff --git a/frysk-core/frysk/bindir/TestFauxv.java b/frysk-core/frysk/bindir/TestFauxv.java index 04eb980..b03aba3 100644 --- a/frysk-core/frysk/bindir/TestFauxv.java +++ b/frysk-core/frysk/bindir/TestFauxv.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import java.io.File; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; @@ -49,7 +49,7 @@ public class TestFauxv extends TestLib { private TearDownExpect fauxv(File coreFile) { String[] argv = new String[3]; int argc = 0; - argv[argc++] = Config.getBinFile("fauxv").getAbsolutePath(); + argv[argc++] = Prefix.binFile("fauxv").getAbsolutePath(); argv[argc++] = "-noexe"; argv[argc++] = coreFile.getAbsolutePath(); return new TearDownExpect(argv); @@ -58,7 +58,7 @@ public class TestFauxv extends TestLib { // Basic sniff test, are we getting output that looks like a auuv? // getAuxv is tested in the frysk-core/proc namespace/ public void testAuxvCore() { - TearDownExpect e = fauxv(Config.getPkgDataFile("test-core-x86")); + TearDownExpect e = fauxv(Prefix.pkgDataFile("test-core-x86")); e.expect("AT_SYSINFO \\(SYSINFO\\) : 6464512"); e.expect("AT_SYSINFO_EHDR \\(SYSINFO EHDR\\) : 0x62a000"); diff --git a/frysk-core/frysk/bindir/TestFcore.java b/frysk-core/frysk/bindir/TestFcore.java index 3a64a1b..b54a173 100644 --- a/frysk-core/frysk/bindir/TestFcore.java +++ b/frysk-core/frysk/bindir/TestFcore.java @@ -41,17 +41,17 @@ package frysk.bindir; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; -import frysk.config.Config; +import frysk.config.Prefix; public class TestFcore extends TestLib { public void testNoArguments() { - TearDownExpect e = new TearDownExpect(Config.getBinFile("fcore")); + TearDownExpect e = new TearDownExpect(Prefix.binFile("fcore")); e.expect("ERROR: No argument provided."); } public void testBadArguments () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fcore").getAbsolutePath (), + Prefix.binFile("fcore").getAbsolutePath (), "this is a bad argument" }); e.expect("Error: "); @@ -59,7 +59,7 @@ public class TestFcore extends TestLib { public void testBadDebugParameter () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fcore").getAbsolutePath (), + Prefix.binFile("fcore").getAbsolutePath (), "-debug", "frysk=SILLY", "1" }); @@ -68,7 +68,7 @@ public class TestFcore extends TestLib { public void testGoodDebugParameter () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fcore").getAbsolutePath (), + Prefix.binFile("fcore").getAbsolutePath (), "-debug", "frysk=FINE", "no-such-file" }); @@ -77,7 +77,7 @@ public class TestFcore extends TestLib { public void testInvalidArgument () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fcore").getAbsolutePath (), + Prefix.binFile("fcore").getAbsolutePath (), "-z", "1" }); diff --git a/frysk-core/frysk/bindir/TestFdebuginfo.java b/frysk-core/frysk/bindir/TestFdebuginfo.java index 632f7e0..d6a2d97 100644 --- a/frysk-core/frysk/bindir/TestFdebuginfo.java +++ b/frysk-core/frysk/bindir/TestFdebuginfo.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; import frysk.proc.Task; @@ -56,7 +56,7 @@ public class TestFdebuginfo extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fdebuginfo").getAbsolutePath(), + Prefix.binFile("fdebuginfo").getAbsolutePath(), ""+task.getProc().getPid() }); // Look for the path of executable @@ -65,14 +65,14 @@ public class TestFdebuginfo extends TestLib { public void testNoArguments() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fdebuginfo").getAbsolutePath () + Prefix.binFile("fdebuginfo").getAbsolutePath () }); e.expect("ERROR: No argument provided."); } public void testBadArguments() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fdebuginfo").getAbsolutePath (), + Prefix.binFile("fdebuginfo").getAbsolutePath (), "this is a bad argument" }); e.expect("Error: "); @@ -80,7 +80,7 @@ public class TestFdebuginfo extends TestLib { public void testInvalidArgument() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fdebuginfo").getAbsolutePath (), + Prefix.binFile("fdebuginfo").getAbsolutePath (), "-z", "1" }); diff --git a/frysk-core/frysk/bindir/TestFerror.java b/frysk-core/frysk/bindir/TestFerror.java index 307a46b..ab1ec37 100644 --- a/frysk-core/frysk/bindir/TestFerror.java +++ b/frysk-core/frysk/bindir/TestFerror.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; import frysk.proc.Task; @@ -49,11 +49,11 @@ public class TestFerror extends TestLib { public void testFerrorTracesExecutables () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ferror").getAbsolutePath(), + Prefix.binFile("ferror").getAbsolutePath(), "-e", "fork", "--", - Config.getPkgLibFile("funit-3forks").getAbsolutePath()}); + Prefix.pkgLibFile("funit-3forks").getAbsolutePath()}); e.expect("Tracing"); e.expect("main"); } @@ -62,7 +62,7 @@ public class TestFerror extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ferror").getAbsolutePath(), + Prefix.binFile("ferror").getAbsolutePath(), "-e", "clone", "--", @@ -74,22 +74,22 @@ public class TestFerror extends TestLib { public void testFerrorFollowsForks() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ferror").getAbsolutePath(), + Prefix.binFile("ferror").getAbsolutePath(), "-e", "fork3", "--", - Config.getPkgLibFile("funit-3forks").getAbsolutePath()}); + Prefix.pkgLibFile("funit-3forks").getAbsolutePath()}); e.expect("Tracing"); e.expect("main"); } public void testFerrorUnderstandsRegex() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ferror").getAbsolutePath(), + Prefix.binFile("ferror").getAbsolutePath(), "-e", "fork*", "--", - Config.getPkgLibFile("funit-3forks").getAbsolutePath()}); + Prefix.pkgLibFile("funit-3forks").getAbsolutePath()}); e.expect("Tracing"); e.expect("main"); e.expect("main"); diff --git a/frysk-core/frysk/bindir/TestFexe.java b/frysk-core/frysk/bindir/TestFexe.java index bad06fd..a1eeb6b 100644 --- a/frysk-core/frysk/bindir/TestFexe.java +++ b/frysk-core/frysk/bindir/TestFexe.java @@ -41,12 +41,12 @@ package frysk.bindir; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; -import frysk.config.Config; +import frysk.config.Prefix; import java.io.File; public class TestFexe extends TestLib { public void testExeOfPid() { - File fexe = Config.getBinFile("fexe"); + File fexe = Prefix.binFile("fexe"); // XXX: Some versions of bash (e.g., bash-3.2-20.fc8.x86_64) // will exec, instead of fork, a program if it is the only // command. This leads to $$ pointing at the fexe process. @@ -61,7 +61,7 @@ public class TestFexe extends TestLib { public void testExeOfExe() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fexe").getPath(), + Prefix.binFile("fexe").getPath(), "-exe", "/bin/ls", "--", "arg0", "arg1" @@ -72,7 +72,7 @@ public class TestFexe extends TestLib { public void testExePath() { TearDownExpect e = new TearDownExpect(new String[] { "/bin/bash", "-c", - "PATH=/bin " + Config.getBinFile("fexe").getPath() + " ls" + "PATH=/bin " + Prefix.binFile("fexe").getPath() + " ls" }); e.expect("/bin/ls" + "\r\n"); } diff --git a/frysk-core/frysk/bindir/TestFhpd.java b/frysk-core/frysk/bindir/TestFhpd.java index 7dc1b63..1464938 100755 --- a/frysk-core/frysk/bindir/TestFhpd.java +++ b/frysk-core/frysk/bindir/TestFhpd.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.TestLib; import frysk.testbed.TearDownExpect; @@ -54,9 +54,9 @@ public class TestFhpd extends TestLib { private final String prompt = "\\(fhpd\\) "; public void testHpdPid () { - TearDownExpect child = new TearDownExpect(Config.getPkgLibFile("hpd-c")); + TearDownExpect child = new TearDownExpect(Prefix.pkgLibFile("hpd-c")); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fhpd").getPath(), + Prefix.binFile("fhpd").getPath(), child.getPid().toString() }); e.expect("Attached to process.*\n" + prompt); @@ -64,16 +64,16 @@ public class TestFhpd extends TestLib { public void testHpdCommand () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fhpd").getPath(), - Config.getPkgLibFile("hpd-c").getPath() + Prefix.binFile("fhpd").getPath(), + Prefix.pkgLibFile("hpd-c").getPath() }); e.expect("Loaded executable file.*" + prompt); } public void testHpdCore () { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("fhpd").getPath(), - Config.getPkgDataFile("test-core-x86").getPath(), + Prefix.binFile("fhpd").getPath(), + Prefix.pkgDataFile("test-core-x86").getPath(), "-noexe" }); e.expect("Attached to core file.*"); diff --git a/frysk-core/frysk/bindir/TestFmaps.java b/frysk-core/frysk/bindir/TestFmaps.java index 967c8b8..1717c3f 100644 --- a/frysk-core/frysk/bindir/TestFmaps.java +++ b/frysk-core/frysk/bindir/TestFmaps.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import java.io.File; import frysk.testbed.TearDownExpect; import frysk.testbed.CorefileFactory; @@ -53,11 +53,11 @@ public class TestFmaps extends TestLib { * the first 50 characters of the executable. */ private TearDownExpect fmaps(String program, String[] args) { - File coreExe = Config.getPkgLibFile(program); + File coreExe = Prefix.pkgLibFile(program); File coreFile = CorefileFactory.constructCoreAtSignal(coreExe); String[] argv = new String[args.length + 3]; int argc = 0; - argv[argc++] = Config.getBinFile("fmaps").getAbsolutePath(); + argv[argc++] = Prefix.binFile("fmaps").getAbsolutePath(); argv[argc++] = coreFile.getAbsolutePath(); argv[argc++] = coreExe.getAbsolutePath(); for (int i = 0; i < args.length; i++) { diff --git a/frysk-core/frysk/bindir/TestFstep.java b/frysk-core/frysk/bindir/TestFstep.java index d4ba152..53c73ae 100644 --- a/frysk-core/frysk/bindir/TestFstep.java +++ b/frysk-core/frysk/bindir/TestFstep.java @@ -40,7 +40,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import java.io.File; import frysk.expunit.Regex; import frysk.proc.Task; @@ -62,7 +62,7 @@ public class TestFstep extends TestLib { ElfEHeader h = e.getEHeader(); final String entryAddress = "0x" + Long.toHexString(h.entry); - String command = Config.getBinFile("fstep").getAbsolutePath(); + String command = Prefix.binFile("fstep").getAbsolutePath(); String argument = "/bin/true"; TearDownExpect expect = new TearDownExpect(new String[] { command, argument @@ -84,7 +84,7 @@ public class TestFstep extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); - String command = Config.getBinFile("fstep").getAbsolutePath(); + String command = Prefix.binFile("fstep").getAbsolutePath(); String argument = "" + task.getProc().getPid(); TearDownExpect expect = new TearDownExpect(new String[] { command, argument diff --git a/frysk-core/frysk/bindir/TestFtrace.java b/frysk-core/frysk/bindir/TestFtrace.java index 63a9643..eab825a 100644 --- a/frysk-core/frysk/bindir/TestFtrace.java +++ b/frysk-core/frysk/bindir/TestFtrace.java @@ -39,7 +39,7 @@ package frysk.bindir; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.testbed.TearDownExpect; import frysk.testbed.TestLib; import frysk.proc.Task; @@ -51,7 +51,7 @@ public class TestFtrace extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ftrace").getAbsolutePath(), + Prefix.binFile("ftrace").getAbsolutePath(), ""+task.getProc().getPid() }); e.expect(""+task.getProc().getPid()+"."+ task.getTid() + " attached"); @@ -61,7 +61,7 @@ public class TestFtrace extends TestLib { if (unresolvedOffUtrace(5055)) return; TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ftrace").getAbsolutePath(), + Prefix.binFile("ftrace").getAbsolutePath(), "-sys=", "/bin/ls" }); @@ -74,7 +74,7 @@ public class TestFtrace extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ftrace").getAbsolutePath(), + Prefix.binFile("ftrace").getAbsolutePath(), "-sys=", ""+task.getProc().getPid() }); @@ -89,7 +89,7 @@ public class TestFtrace extends TestLib { SlaveOffspring child = SlaveOffspring.createChild(); Task task = child.findTaskUsingRefresh(true); TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ftrace").getAbsolutePath(), + Prefix.binFile("ftrace").getAbsolutePath(), "-sys=", "-follow", ""+task.getProc().getPid() @@ -102,7 +102,7 @@ public class TestFtrace extends TestLib { public void testFtraceHandlesProcessNotFound() { TearDownExpect e = new TearDownExpect(new String[] { - Config.getBinFile("ftrace").getAbsolutePath(), + Prefix.binFile("ftrace").getAbsolutePath(), "-sys=", "0" }); diff --git a/frysk-core/frysk/dom/ChangeLog b/frysk-core/frysk/dom/ChangeLog index e178d64..7b48e78 100644 --- a/frysk-core/frysk/dom/ChangeLog +++ b/frysk-core/frysk/dom/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 Andrew Cagney <cagney@redhat.com> + + * TestParser.java: Use frysk.config.Prefix. + 2008-03-03 Andrew Cagney <cagney@redhat.com> * TestParser.java: Use frysk.config. diff --git a/frysk-core/frysk/dom/TestParser.java b/frysk-core/frysk/dom/TestParser.java index e2588e1..5801d83 100644 --- a/frysk-core/frysk/dom/TestParser.java +++ b/frysk-core/frysk/dom/TestParser.java @@ -41,7 +41,7 @@ package frysk.dom; import frysk.junit.TestCase; -import frysk.config.Config; +import frysk.config.Prefix; import frysk.dom.DOMFrysk; import frysk.dom.DOMImage; import frysk.dom.DOMSource; @@ -89,7 +89,7 @@ public class TestParser String IMAGE_FILENAME = "Task 28428"; String CC_FILE = "./test"; - String execPath = Config.getPkgLibFile("test_main_looper").getPath(); + String execPath = Prefix.pkgLibFile("test_main_looper").getPath(); List sources = DOMCommon.getSrcFiles (execPath); assertTrue ("sources.size > 0", sources.size () > 0); @@ -173,7 +173,7 @@ public class TestParser public static void assertDomMatchesBase (File newfile) throws IOException { - File baseDomInput = Config.getPkgDataFile("test_looper.xml"); + File baseDomInput = Prefix.pkgDataFile("test_looper.xml"); FileInputStream base = new FileInputStream(newfile); FileInputStream newdom = new FileInputStream(baseDomInput); diff --git a/frysk-core/frysk/isa/ChangeLog b/frysk-core/frysk/isa/ChangeLog index 3826586..82f7673 100644 --- a/frysk-core/frysk/isa/ChangeLog +++ b/frysk-core/frysk/isa/ChangeLog @@ -1,3 +1,7 @@ +2008-04-17 Andrew Cagney <cagney@redhat.com> + + * TestISA.java: Use frysk.config.Prefix. + 2008-03-03 Andrew Cagney <cagney@redhat.com> * TestISA.java: Use frysk.config. diff --git a/frysk-core/frysk/isa/TestISA.java b/frysk-core/frysk/isa/TestISA.java index 84e5e81..ec2af99 100644 --- a/frysk-core/frysk/isa/TestISA.java +++ b/frysk-core/frysk/isa/TestISA.java @@ -40,7 +40,7 @@ package frysk.isa; import frysk.junit.TestCase; -import frysk.config.Config; +import frysk.config.Prefix; /** * Searchable, hashable key sufficient for identifying the supported @@ -65,12 +65,12 @@ public class TestISA extends TestCase { } public void testElfGet() { assertSame("IA32 core", ISA.IA32, - ElfMap.getISA(Config.getPkgDataFile("test-core-x86"))); + ElfMap.getISA(Prefix.pkgDataFile("test-core-x86"))); assertSame("X8664 core", ISA.X8664, - ElfMap.getISA(Config.getPkgDataFile("test-core-x8664"))); + ElfMap.getISA(Prefix.pkgDataFile("test-core-x8664"))); assertSame("IA32 exe", ISA.IA32, - ElfMap.getISA(Config.getPkgDataFile("test-exe-x86"))); + ElfMap.getISA(Prefix.pkgDataFile("test-exe-x86"))); } public void testMappedIsa() { ISAMap map = new ISAMap("good") diff --git a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java b/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java index 93349b9..2d852eb 100644 --- a/frysk-core/frysk/isa/watchpoints/TestWatchpoint.java hooks/post-receive -- frysk system monitor/debugger
reply other threads:[~2008-04-17 14:51 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080417145109.22513.qmail@sourceware.org \ --to=cagney@sourceware.org \ --cc=frysk-cvs@sourceware.org \ --cc=frysk@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).