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 Config.getBinFile.
Date: Thu, 17 Apr 2008 17:27:00 -0000	[thread overview]
Message-ID: <20080417172740.1449.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  9ff746a00ed1e054abaf5b44cc27be4061b51cd9 (commit)
      from  ea5482585eee09d4637c028700283bc5bbf0b940 (commit)

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

- Log -----------------------------------------------------------------
commit 9ff746a00ed1e054abaf5b44cc27be4061b51cd9
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Apr 17 13:23:41 2008 -0400

    Delete Config.getBinFile.
    
    frysk-core/frysk/hpd/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* HpdTestbed.java: Use frysk.config.Prefix.
    	* TestPeekCommand.java: Ditto.
    	* TestCoreCommand.java: Ditto.
    	* TestLoadCommand.java: Ditto.
    
    frysk-core/frysk/proc/dead/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* TestCorefileByteBuffer.java: Use frysk.config.Prefix.
    	* TestLinuxExe.java: Ditto.
    	* TestInterpreter.java: Ditto.
    	* TestLinuxCore.java: Ditto.
    
    frysk-sys/frysk/config/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* Config.java (getBinFile(String)): Delete.
    	(getPkgDataFile(String)): Delete.

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

Summary of changes:
 frysk-core/frysk/hpd/ChangeLog                     |    7 +++++++
 frysk-core/frysk/hpd/HpdTestbed.java               |   16 ++++++++--------
 frysk-core/frysk/hpd/TestCoreCommand.java          |    8 ++++----
 frysk-core/frysk/hpd/TestLoadCommand.java          |   18 +++++++++---------
 frysk-core/frysk/hpd/TestPeekCommand.java          |   12 ++++++------
 frysk-core/frysk/proc/dead/ChangeLog               |    7 +++++++
 .../frysk/proc/dead/TestCorefileByteBuffer.java    |   18 +++++++++---------
 frysk-core/frysk/proc/dead/TestInterpreter.java    |    4 ++--
 frysk-core/frysk/proc/dead/TestLinuxCore.java      |    6 +++---
 frysk-core/frysk/proc/dead/TestLinuxExe.java       |   14 +++++++-------
 frysk-sys/frysk/config/ChangeLog                   |    3 +++
 frysk-sys/frysk/config/Config.java                 |   19 -------------------
 12 files changed, 65 insertions(+), 67 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index bc0db18..075a298 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-17  Andrew Cagney  <cagney@redhat.com>
+
+	* HpdTestbed.java: Use frysk.config.Prefix.
+	* TestPeekCommand.java: Ditto.
+	* TestCoreCommand.java: Ditto.
+	* TestLoadCommand.java: Ditto.
+
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
 	* TestFhpdStepping.java: Use frysk.config.Prefix.
diff --git a/frysk-core/frysk/hpd/HpdTestbed.java b/frysk-core/frysk/hpd/HpdTestbed.java
index 6334305..df06bbc 100644
--- a/frysk-core/frysk/hpd/HpdTestbed.java
+++ b/frysk-core/frysk/hpd/HpdTestbed.java
@@ -40,7 +40,7 @@
 package frysk.hpd;
 
 import frysk.junit.TestCase;
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.testbed.CorefileFactory;
 import frysk.expunit.Match;
 import frysk.expunit.Regex;
@@ -71,7 +71,7 @@ public class HpdTestbed extends TearDownExpect {
      */
     public HpdTestbed() {
 	this(new String[] {
-		Config.getBinFile("fhpd").getPath()
+		Prefix.binFile("fhpd").getPath()
 	     });
 	expectPrompt();
     }
@@ -82,7 +82,7 @@ public class HpdTestbed extends TearDownExpect {
      */
     public HpdTestbed(String param, String startup) {
 	this(new String[] {
-		  Config.getBinFile("fhpd").getPath (),
+		  Prefix.binFile("fhpd").getPath (),
 		  param
 	      });
 	expectPrompt(startup);
@@ -155,7 +155,7 @@ public class HpdTestbed extends TearDownExpect {
      */
     static HpdTestbed attachXXX(String program) {
 	TearDownExpect child
-	    = new TearDownExpect(Config.getPkgLibFile(program));
+	    = new TearDownExpect(Prefix.pkgLibFile(program));
 	ProcessIdentifier pid = child.getPid();
 	return new HpdTestbed(pid.toString(),
 			      "Attached to process "
@@ -168,7 +168,7 @@ public class HpdTestbed extends TearDownExpect {
      */
     static HpdTestbed run(String program, String args) {
 	HpdTestbed h = new HpdTestbed();
-	File exe = Config.getPkgLibFile(program);
+	File exe = Prefix.pkgLibFile(program);
 	h.send("run ");
 	h.send(exe.getAbsolutePath());
 	if (args != null) {
@@ -211,7 +211,7 @@ public class HpdTestbed extends TearDownExpect {
      */
     static HpdTestbed load(String program, String args) {
 	HpdTestbed h = new HpdTestbed();
-	File exe = Config.getPkgLibFile(program);
+	File exe = Prefix.pkgLibFile(program);
 	String command;
 	if (args == null)
 	    command = "load " + exe;
@@ -234,11 +234,11 @@ public class HpdTestbed extends TearDownExpect {
      * run the program to the terminating event.
      */
     static HpdTestbed hpdTerminatingProgram(String program) {
-	File exeFile = Config.getPkgLibFile(program);
+	File exeFile = Prefix.pkgLibFile(program);
 	File coreFile = CorefileFactory.constructCoreAtSignal(exeFile);
 	HpdTestbed hpd
 	    = new HpdTestbed(new String[] {
-				 Config.getBinFile("fhpd").getPath (),
+				 Prefix.binFile("fhpd").getPath (),
 				 coreFile.toString(),
 				 exeFile.toString()
 			     });
diff --git a/frysk-core/frysk/hpd/TestCoreCommand.java b/frysk-core/frysk/hpd/TestCoreCommand.java
index 39d12d2..9ba3eb1 100644
--- a/frysk-core/frysk/hpd/TestCoreCommand.java
+++ b/frysk-core/frysk/hpd/TestCoreCommand.java
@@ -41,12 +41,12 @@ package frysk.hpd;
 
 import java.io.File;
 import frysk.testbed.CorefileFactory;
-import frysk.config.Config;
+import frysk.config.Prefix;
 
 public class TestCoreCommand extends TestLib {
 
     private final String corefile
-	= Config.getPkgDataFile("test-core-x86").getPath();
+	= Prefix.pkgDataFile("test-core-x86").getPath();
 
     public void testCoreCommand() {
 	e = new HpdTestbed();
@@ -67,7 +67,7 @@ public class TestCoreCommand extends TestLib {
     }
 
     public void testCoreExeCommand() {
-	File exe = Config.getPkgLibFile("funit-hello");
+	File exe = Prefix.pkgLibFile("funit-hello");
 	File core = CorefileFactory.constructCoreAtSignal(exe);
 	e = new HpdTestbed();
 	e.sendCommandExpectPrompt(("core " + core.getPath()
@@ -76,7 +76,7 @@ public class TestCoreCommand extends TestLib {
     }
     
     public void testCoreThenRunCommand() {
-	File exe = Config.getPkgLibFile("funit-hello");
+	File exe = Prefix.pkgLibFile("funit-hello");
 	File core = CorefileFactory.constructCoreAtSignal(exe);
 	e = new HpdTestbed();
 	e.sendCommandExpectPrompt(("core " + core.getPath()
diff --git a/frysk-core/frysk/hpd/TestLoadCommand.java b/frysk-core/frysk/hpd/TestLoadCommand.java
index ccc3dbd..04d6618 100644
--- a/frysk-core/frysk/hpd/TestLoadCommand.java
+++ b/frysk-core/frysk/hpd/TestLoadCommand.java
@@ -39,7 +39,7 @@
 
 package frysk.hpd;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 
 /**
  * This class tests the "load" command basics of both loading a correct
@@ -49,7 +49,7 @@ import frysk.config.Config;
 public class TestLoadCommand extends TestLib {
     public void testLoadCommand() {
 	e = new HpdTestbed();
-	e.send("load " + Config.getPkgDataFile("test-exe-x86").getPath()
+	e.send("load " + Prefix.pkgDataFile("test-exe-x86").getPath()
 		+ "\n");
 	e.expect("\\[0\\.0\\] Loaded executable file.*");
 	e.send("quit\n");
@@ -59,17 +59,17 @@ public class TestLoadCommand extends TestLib {
 
     public void testLoadCommandError() {
 	e = new HpdTestbed();
-	e.send("load " + Config.getPkgDataFile("test-exe-x86").getPath()
+	e.send("load " + Prefix.pkgDataFile("test-exe-x86").getPath()
 		+ "foo\n");
 	e.expect("Error: open: No such file or directory.*");
     }
     
     public void testLoadStart() {
 	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("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*");
-	e.sendCommandExpectPrompt("load " + Config.getPkgLibFile("funit-hello").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(),
 		"\\[1\\.0] Loaded executable file.*");
 	e.sendCommandExpectPrompt("focus", "Target set.*\\[0\\.0\\]\t\t0\t0.*"+
 		"\\[1\\.0\\]\t\t0*\\t0.*");
@@ -82,9 +82,9 @@ public class TestLoadCommand extends TestLib {
     
     public void testLoadRunRun() {
 	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("load " + Config.getPkgLibFile("funit-threads-looper").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-threads-looper").getPath(),
 		"\\[1\\.0\\] Loaded executable file.*");
 	e.sendCommandExpectPrompt("start", "Attached to process.*Attached to process.*");
 	e.send("quit\n");
@@ -102,9 +102,9 @@ public class TestLoadCommand extends TestLib {
     
     public void testLoadDisplay() {
 	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("load " + Config.getPkgLibFile("funit-hello").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgLibFile("funit-hello").getPath(),
 		"\\[1\\.0\\] Loaded executable file.*");
 	e.sendCommandExpectPrompt("load", "Loaded procs.*\\[0\\.0\\].*\\[1\\.0\\].*");
 	e.send("quit\n");
diff --git a/frysk-core/frysk/hpd/TestPeekCommand.java b/frysk-core/frysk/hpd/TestPeekCommand.java
index 91e552b..2a2dbb1 100644
--- a/frysk-core/frysk/hpd/TestPeekCommand.java
+++ b/frysk-core/frysk/hpd/TestPeekCommand.java
@@ -39,7 +39,7 @@
 
 package frysk.hpd;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 
 /**
  * This class tests the "peek" command.
@@ -48,7 +48,7 @@ import frysk.config.Config;
 public class TestPeekCommand extends TestLib {
     public void testPeekCommand() {
 	e = new HpdTestbed();
-	e.sendCommandExpectPrompt("load " + Config.getPkgDataFile("test-exe-x86").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgDataFile("test-exe-x86").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("peek 0x08048000L", 
 		"The value at 08048000 = 127.*");
@@ -57,7 +57,7 @@ public class TestPeekCommand extends TestLib {
 
     public void testPeekCommandError() {
 	e = new HpdTestbed();
-	e.sendCommandExpectPrompt("load " + Config.getPkgDataFile("test-exe-x86").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgDataFile("test-exe-x86").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("peek 08048000", 
 		"Cannot find memory in exe file.*");
@@ -66,9 +66,9 @@ public class TestPeekCommand extends TestLib {
     
     public void testTwoLoadedPeekCommand() {
 	e = new HpdTestbed();
-	e.sendCommandExpectPrompt("load " + Config.getPkgDataFile("test-exe-x86").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgDataFile("test-exe-x86").getPath(),
 		"Loaded executable file.*");
-	e.sendCommandExpectPrompt("load " + Config.getPkgDataFile("test-exe-x86").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgDataFile("test-exe-x86").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("peek 0x08048000L", "\\[0\\.0\\].*" +
 		"The value at 08048000 = 127.*\\[1\\.0\\].*" +
@@ -78,7 +78,7 @@ public class TestPeekCommand extends TestLib {
     
     public void testPeekCommandNoParameter() {
 	e = new HpdTestbed();
-	e.sendCommandExpectPrompt("load " + Config.getPkgDataFile("test-exe-x86").getPath(),
+	e.sendCommandExpectPrompt("load " + Prefix.pkgDataFile("test-exe-x86").getPath(),
 		"Loaded executable file.*");
 	e.sendCommandExpectPrompt("peek", "Error: Not enough parameters.*" + 
 		"Please specify an addess to peek at.*");
diff --git a/frysk-core/frysk/proc/dead/ChangeLog b/frysk-core/frysk/proc/dead/ChangeLog
index 1782d8f..324f201 100644
--- a/frysk-core/frysk/proc/dead/ChangeLog
+++ b/frysk-core/frysk/proc/dead/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-17  Andrew Cagney  <cagney@redhat.com>
+
+	* TestCorefileByteBuffer.java: Use frysk.config.Prefix.
+	* TestLinuxExe.java: Ditto.
+	* TestInterpreter.java: Ditto.
+	* TestLinuxCore.java: Ditto.
+
 2008-04-15  Teresa Thomas  <tthomas@redhat.com>
 
 	* DeadTask.java (isInstructionObserverAdded): New.
diff --git a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
index aafe4bd..47cbc97 100644
--- a/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
+++ b/frysk-core/frysk/proc/dead/TestCorefileByteBuffer.java
@@ -45,7 +45,7 @@ import lib.dwfl.ElfCommand;
 
 import lib.dwfl.ElfException;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.testbed.TestLib;
 import inua.eio.ByteBuffer;
 
@@ -64,7 +64,7 @@ public class TestCorefileByteBuffer
     final long elfLen = 0x1000;
 
     ByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
     
     // Slice buffer
     ByteBuffer coreSlice = coreBuffer.slice(sliceBottom, sliceTop);
@@ -72,7 +72,7 @@ public class TestCorefileByteBuffer
     assertNotNull("Corefile slice was null", coreSlice);
 
     // Independently get the elf core data as a raw image
-    Elf segment = new Elf(Config.getPkgDataFile("test-core-x86"),
+    Elf segment = new Elf(Prefix.pkgDataFile("test-core-x86"),
 			  ElfCommand.ELF_C_READ);
     assertNotNull("Get Elf file for segment inspection", segment);
     rawData = segment.getRawData(elfOffset,elfLen);
@@ -93,7 +93,7 @@ public class TestCorefileByteBuffer
   {
 
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
 
     // Test beginning segment
     assertEquals("Peek a byte at 0x0062a000",0x7f,coreBuffer.peek(0x0062a000L));
@@ -117,7 +117,7 @@ public class TestCorefileByteBuffer
   {
     
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
 
     // Attempt to peek over a segment boundary, but within the 
     // high and low marks of the bytebuffer
@@ -138,7 +138,7 @@ public class TestCorefileByteBuffer
   {
 
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
     // Attempt to peek under a segment boundary, but within the 
     // high and low marks of the bytebuffer
 
@@ -157,7 +157,7 @@ public class TestCorefileByteBuffer
   public void testCoreFileByteBufferSequentialGet() throws ElfException
   {
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
 
     coreBuffer.position(0x0062a000L);
     assertEquals("Peek a byte at 0x0062a000",0x7f,coreBuffer.get());
@@ -190,7 +190,7 @@ public class TestCorefileByteBuffer
   {
     
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
     byte byteArray[] = new byte[10];
 
     coreBuffer.get(0x0062a000L, byteArray, 0, 10);
@@ -206,7 +206,7 @@ public class TestCorefileByteBuffer
   {
 
     CorefileByteBuffer coreBuffer
-	= new CorefileByteBuffer(Config.getPkgDataFile("test-core-x86"));
+	= new CorefileByteBuffer(Prefix.pkgDataFile("test-core-x86"));
 
     try
     {
diff --git a/frysk-core/frysk/proc/dead/TestInterpreter.java b/frysk-core/frysk/proc/dead/TestInterpreter.java
index 57e0948..bea01a5 100644
--- a/frysk-core/frysk/proc/dead/TestInterpreter.java
+++ b/frysk-core/frysk/proc/dead/TestInterpreter.java
@@ -40,7 +40,7 @@
 package frysk.proc.dead;
 
 import frysk.junit.TestCase;
-import frysk.config.Config;
+import frysk.config.Prefix;
 
 /**
  * Test the interpreter parser.
@@ -95,7 +95,7 @@ public class TestInterpreter extends TestCase {
     public void testFile() {
 	assertEquals("args",
 		     new String[] { "/bin/sh", "script", "param" },
-		     InterpreterFactory.parse(Config.getBinFile("fdebugrpm"),
+		     InterpreterFactory.parse(Prefix.binFile("fdebugrpm"),
 					      new String[] {
 						  "script", "param"
 					      }));
diff --git a/frysk-core/frysk/proc/dead/TestLinuxCore.java b/frysk-core/frysk/proc/dead/TestLinuxCore.java
index 7d97a9e..399dc46 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxCore.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxCore.java
@@ -49,7 +49,7 @@ import lib.dwfl.Dwfl;
 import java.util.Iterator;
 import lib.dwfl.DwflModule;
 import lib.dwfl.SymbolBuilder;
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.debuginfo.PrintStackOptions;
 import frysk.dwfl.DwflCache;
 import frysk.event.Event;
@@ -73,7 +73,7 @@ import frysk.util.StacktraceAction;
 
 public class TestLinuxCore extends TestLib {
     private Proc coreProc
-	= LinuxCoreFactory.createProc(Config.getPkgDataFile("test-core-x86"));
+	= LinuxCoreFactory.createProc(Prefix.pkgDataFile("test-core-x86"));
 
 
     public void testRelativePath() {
@@ -203,7 +203,7 @@ public class TestLinuxCore extends TestLib {
    
 
     // Create a blocked process, blocked at a signal
-    File exeFile = Config.getPkgLibFile("funit-stacks");
+    File exeFile = Prefix.pkgLibFile("funit-stacks");
     Proc testProc = new DaemonBlockedAtSignal(exeFile).getMainTask().getProc();
     File coreFile = CorefileFactory.constructCore(testProc);
 
diff --git a/frysk-core/frysk/proc/dead/TestLinuxExe.java b/frysk-core/frysk/proc/dead/TestLinuxExe.java
index 4e94183..8c467df 100644
--- a/frysk-core/frysk/proc/dead/TestLinuxExe.java
+++ b/frysk-core/frysk/proc/dead/TestLinuxExe.java
@@ -39,7 +39,7 @@
 
 package frysk.proc.dead;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import inua.eio.ByteBuffer;
 import java.util.HashSet;
 import frysk.proc.FindProc;
@@ -54,7 +54,7 @@ import frysk.testbed.TestLib;
 public class TestLinuxExe extends TestLib {
     public void testLinuxTaskMemory() {
 	Proc proc
-	    = LinuxExeFactory.createProc(Config.getPkgDataFile("test-exe-x86"),
+	    = LinuxExeFactory.createProc(Prefix.pkgDataFile("test-exe-x86"),
 					 new String[0]);
 	assertNotNull("Proc exists in exefile", proc);
 	assertNotNull("Executable file Host is Null?",proc.getHost());
@@ -77,7 +77,7 @@ public class TestLinuxExe extends TestLib {
 
     public void testRequestRefresh() {
 	final Proc proc
-	    = LinuxExeFactory.createProc(Config.getPkgDataFile("test-exe-x86"),
+	    = LinuxExeFactory.createProc(Prefix.pkgDataFile("test-exe-x86"),
 					 new String[0]);
 	proc.getHost().requestRefresh(new HashSet(), new HostRefreshBuilder() {
 		public void construct(Collection added, Collection removed) {
@@ -91,7 +91,7 @@ public class TestLinuxExe extends TestLib {
 
     public void testRequestProc() {
 	final Proc proc
-	    = LinuxExeFactory.createProc(Config.getPkgDataFile("test-exe-x86"),
+	    = LinuxExeFactory.createProc(Prefix.pkgDataFile("test-exe-x86"),
 					 new String[0]);
 	proc.getHost().requestProc(proc.getPid(), new FindProc() {
 		public void procFound(Proc found) {
@@ -107,16 +107,16 @@ public class TestLinuxExe extends TestLib {
 
     public void testScript() {
 	Proc proc = LinuxExeFactory.createProc(new String[] {
-		Config.getBinFile("fdebugrpm").getPath(),
+		Prefix.binFile("fdebugrpm").getPath(),
 		"arg"
 	    });
 	assertEquals("exe", "/bin/bash", proc.getExeFile().getSysRootedPath());
     }
     
     public void testSysRootedProc() {
-	SysRootCache.setSysroot("funit-quicksort", Config.getPkgLibFile("test-sysroot").getAbsolutePath());
+	SysRootCache.setSysroot("funit-quicksort", Prefix.pkgLibFile("test-sysroot").getAbsolutePath());
 	Proc proc = LinuxExeFactory.createProc(new String[] {"funit-quicksort", ""});
-	int testValue = proc.getExeFile().getSysRootedPath().compareTo(Config.getPkgLibFile("test-sysroot").getAbsolutePath()
+	int testValue = proc.getExeFile().getSysRootedPath().compareTo(Prefix.pkgLibFile("test-sysroot").getAbsolutePath()
 		+ "/usr/bin/funit-quicksort");
 	assertEquals("exe", 0, testValue); 
 	testValue = proc.getExeFile().getFile().getAbsolutePath().compareTo("/usr/bin/funit-quicksort");
diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog
index 586112e..c3d8c41 100644
--- a/frysk-sys/frysk/config/ChangeLog
+++ b/frysk-sys/frysk/config/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-17  Andrew Cagney  <cagney@redhat.com>
 
+	* Config.java (getBinFile(String)): Delete.
+	(getPkgDataFile(String)): Delete.
+	
 	* Prefix.java (gladeFile(String)): Replace gladeDir().
 	* TestPrefix.java: Update.
 	* PrefixFactory.java: Update
diff --git a/frysk-sys/frysk/config/Config.java b/frysk-sys/frysk/config/Config.java
index 445c666..9f53d3f 100644
--- a/frysk-sys/frysk/config/Config.java
+++ b/frysk-sys/frysk/config/Config.java
@@ -47,25 +47,6 @@ import java.io.File;
 
 public class Config {
     /**
-     * A file in frysk's shared, and 32-bit and 64-bit independant,
-     * data directory.  Typically <tt>/usr/share/frysk/FILE</tt>
-     */
-    public static final File getPkgDataFile (String file) {
-	return Prefix.pkgDataFile(file);
-    }
-
-    /**
-     * A file in Frysk's user-visible executable directory.  Typically
-     * <tt>/usr/bin/FILE</tt>.
-     *
-     * Used by install-tree testing when needing to run a user-visible
-     * executable.
-     */
-    public static final File getBinFile(String file) {
-	return Prefix.binFile(file);
-    }
-
-    /**
      * A file in Frysk's library directory.  Typically either
      * <tt>/usr/lib/frysk/FILE</tt> or <tt>/usr/lib64/frysk/FILE</tt>.
      *


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


                 reply	other threads:[~2008-04-17 17:27 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=20080417172740.1449.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: link
Be 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).