public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Delete Config.getRootSrcDir and Config.getPkgLibSrcDir.
@ 2008-04-17  3:41 cagney
  0 siblings, 0 replies; only message in thread
From: cagney @ 2008-04-17  3:41 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  258e9940b611bcdf6b5c2eb0312ecb9f717e86a6 (commit)
      from  0ed6ec301f2086eaf9f88b8f16a7f36191616875 (commit)

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

- Log -----------------------------------------------------------------
commit 258e9940b611bcdf6b5c2eb0312ecb9f717e86a6
Author: Andrew Cagney <cagney@redhat.com>
Date:   Wed Apr 16 23:38:53 2008 -0400

    Delete Config.getRootSrcDir and Config.getPkgLibSrcDir.
    
    frysk-core/frysk/bindir/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestFstack.java: Use frysk.config.Prefix.
    	* TestFcatch.java: Ditto.
    
    frysk-core/frysk/debuginfo/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestObjectDeclarationSearchEngine.java: Use frysk.config.Prefix.
    
    frysk-core/frysk/hpd/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestFhpdStepping.java: Use frysk.config.Prefix.
    	* TestHpdTestHarness.java: Use frysk.config.Prefix.
    
    frysk-core/frysk/rt/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* LineBreakpoint.java (LineBreakpoint(int,File,int,int)): New.
    	* TestDisplayValue.java: Use frysk.config.Prefix.
    	* TestUpdatingDisplayValue.java: Ditto.
    	* BreakpointManager.java (addLineBreakpoint(File,int,int)): New.
    
    frysk-core/frysk/scopes/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestDie.java: Use frysk.config.Prefix.
    
    frysk-core/frysk/stack/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestLibFunctionStepFrame.java: Use frysk.config.Prefix.
    	* TestSignalStepFrame.java: Ditto.
    
    frysk-core/frysk/stepping/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* TestStepping.java: Use frysk.config.Prefix.
    	* TestSteppingEngine.java: Ditto.
    
    frysk-sys/frysk/config/ChangeLog
    2008-04-16  Andrew Cagney  <cagney@redhat.com>
    
    	* cni/Config.cxx-in: Delete.
    	* Config.java (getRootSrcDir()): Delete.
    	(getPkgLibSrcDir()): Delete.

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

Summary of changes:
 frysk-core/frysk/bindir/ChangeLog                  |    3 +
 frysk-core/frysk/bindir/TestFcatch.java            |   14 +-
 frysk-core/frysk/bindir/TestFstack.java            |   12 +-
 frysk-core/frysk/debuginfo/ChangeLog               |    4 +
 .../TestObjectDeclarationSearchEngine.java         |   26 ++--
 frysk-core/frysk/hpd/ChangeLog                     |    4 +
 frysk-core/frysk/hpd/TestFhpdStepping.java         |   22 ++--
 frysk-core/frysk/rt/BreakpointManager.java         |   15 ++-
 frysk-core/frysk/rt/ChangeLog                      |    7 +
 frysk-core/frysk/rt/LineBreakpoint.java            |    8 +-
 frysk-core/frysk/rt/TestDisplayValue.java          |   44 +++---
 frysk-core/frysk/rt/TestUpdatingDisplayValue.java  |   56 ++++----
 frysk-core/frysk/scopes/ChangeLog                  |    4 +
 frysk-core/frysk/scopes/TestDie.java               |    6 +-
 frysk-core/frysk/stack/ChangeLog                   |    5 +
 .../frysk/stack/TestLibFunctionStepFrame.java      |   18 +--
 frysk-core/frysk/stack/TestSignalStepFrame.java    |   20 +--
 frysk-core/frysk/stepping/ChangeLog                |    5 +
 frysk-core/frysk/stepping/TestStepping.java        |  165 +++++++++-----------
 frysk-core/frysk/stepping/TestSteppingEngine.java  |  107 ++++++-------
 frysk-sys/frysk/config/ChangeLog                   |    4 +
 frysk-sys/frysk/config/Config.java                 |   15 --
 frysk-sys/frysk/config/cni/Config.cxx-in           |   57 -------
 23 files changed, 279 insertions(+), 342 deletions(-)
 delete mode 100644 frysk-sys/frysk/config/cni/Config.cxx-in

First 500 lines of diff:
diff --git a/frysk-core/frysk/bindir/ChangeLog b/frysk-core/frysk/bindir/ChangeLog
index f0001b5..5b485a7 100644
--- a/frysk-core/frysk/bindir/ChangeLog
+++ b/frysk-core/frysk/bindir/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
+	* TestFstack.java: Use frysk.config.Prefix.
+	* TestFcatch.java: Ditto.
+	
 	* TestFstack.java (getCanonicalRootSrcDir()): Replace
 	getCanonicalAbsRootSrcDir.
 
diff --git a/frysk-core/frysk/bindir/TestFcatch.java b/frysk-core/frysk/bindir/TestFcatch.java
index 6b141ff..6d6f694 100644
--- a/frysk-core/frysk/bindir/TestFcatch.java
+++ b/frysk-core/frysk/bindir/TestFcatch.java
@@ -40,15 +40,15 @@
 
 package frysk.bindir;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.testbed.TearDownExpect;
 import frysk.testbed.TestLib;
 
 public class TestFcatch extends TestLib {
     public void testBackTrace() {
 	TearDownExpect e = new TearDownExpect(new String[] {
-		Config.getBinFile("fcatch").getAbsolutePath(),
-		Config.getPkgLibFile("funit-stackframe").getAbsolutePath()
+		Prefix.binFile("fcatch").getAbsolutePath(),
+		Prefix.pkgLibFile("funit-stackframe").getAbsolutePath()
 	    });
 	// just look for main.
 	e.expect("in main");
@@ -57,8 +57,8 @@ public class TestFcatch extends TestLib {
     public void testFcatchFollowsForks() {
 
 	TearDownExpect e = new TearDownExpect(new String[] {
-		Config.getBinFile("fcatch").getAbsolutePath(),
-		Config.getPkgLibFile("funit-3forks").getAbsolutePath()
+		Prefix.binFile("fcatch").getAbsolutePath(),
+		Prefix.pkgLibFile("funit-3forks").getAbsolutePath()
 	    });
 	// just look for main.
 	e.expect("in main");
@@ -67,9 +67,9 @@ public class TestFcatch extends TestLib {
     public void testFcatchFollowsPATH() {
 
 	TearDownExpect e = new TearDownExpect(new String[] {
-		Config.getBinFile("fcatch").getAbsolutePath(),
+		Prefix.binFile("fcatch").getAbsolutePath(),
 		"ls",
-		Config.getPkgLibSrcDir()
+		Prefix.pkgLibFile(null).getAbsolutePath()
 	    });
 	// just look for main.
 	e.expect("funit-3forks");
diff --git a/frysk-core/frysk/bindir/TestFstack.java b/frysk-core/frysk/bindir/TestFstack.java
index ba02684..aafeb66 100644
--- a/frysk-core/frysk/bindir/TestFstack.java
+++ b/frysk-core/frysk/bindir/TestFstack.java
@@ -42,7 +42,7 @@ package frysk.bindir;
 import java.io.File;
 import java.io.IOException;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.testbed.CorefileFactory;
 import frysk.testbed.TearDownExpect;
 import frysk.testbed.TestLib;
@@ -59,11 +59,11 @@ public class TestFstack extends TestLib {
      * the first 50 characters of the executable.
      */
     private TearDownExpect fstack(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("fstack").getAbsolutePath();
+	argv[argc++] = Prefix.binFile("fstack").getAbsolutePath();
 	argv[argc++] = coreFile.getAbsolutePath();
 	argv[argc++] = coreExe.getAbsolutePath();
 	for (int i = 0; i < args.length; i++) {
@@ -72,11 +72,11 @@ public class TestFstack extends TestLib {
 	return new TearDownExpect(argv);
     }
 
-    private String getCanonicalRootSrcDir () {
+    private String getCanonicalRootSrcDir() {
 	try {
-	    return new File(Config.getRootSrcDir()).getCanonicalPath();
+	    return Prefix.sourceFile(null).getCanonicalPath();
 	} catch (IOException e) {
-	    return Config.getRootSrcDir();
+	    return Prefix.sourceFile(null).getAbsolutePath();
 	}
     }
     
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 6d39d15..9f3a14b 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-16  Andrew Cagney  <cagney@redhat.com>
+
+	* TestObjectDeclarationSearchEngine.java: Use frysk.config.Prefix.
+
 2008-04-15  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 	* DwarfRegisterMapFactory.java (PPC64BE): New.
 	(isaToMap): Add PPC64BE.
diff --git a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
index 5eb82ae..6362746 100644
--- a/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
+++ b/frysk-core/frysk/debuginfo/TestObjectDeclarationSearchEngine.java
@@ -41,7 +41,7 @@ package frysk.debuginfo;
 
 import java.io.File;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.proc.Task;
 import frysk.scopes.Variable;
 import frysk.testbed.DaemonBlockedAtSignal;
@@ -67,11 +67,15 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
     
     ObjectDeclarationSearchEngine objectDeclarationSearchEngine;
     
+    private File getSrc(String name) {
+	return Prefix.sourceFile("frysk-core/frysk/pkglibdir/" + name);
+    }
+
     public void testFindVar1Scopes(){
 	String variableName = "var1"; 
 	String variableToken = variableName; 
 	String fileName = "funit-c-scopes";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".c";
+	File srcPath = getSrc(fileName + ".c");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -80,7 +84,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	String variableName = "var2"; 
 	String variableToken = variableName; 
 	String fileName = "funit-c-scopes";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".c";
+	File srcPath = getSrc(fileName + ".c");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -89,7 +93,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	String variableName = "arg1"; 
 	String variableToken = variableName; 
 	String fileName = "funit-c-scopes";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".c";
+	File srcPath = getSrc(fileName + ".c");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -98,7 +102,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	String variableName = "i"; 
 	String variableToken = "second i"; 
 	String fileName = "funit-c-scopes-shadowing";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".c";
+	File srcPath = getSrc(fileName + ".c");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -107,7 +111,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	String variableName = "first"; 
 	String variableToken = variableName; 
 	String fileName = "funit-cpp-scopes-namespace";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".cxx";
+	File srcPath = getSrc(fileName + ".cxx");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -131,7 +135,7 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
 	String variableName = "first"; 
 	String variableToken = "*this*"; 
 	String fileName = "funit-cpp-scopes-class";
-	String srcPath = Config.getPkgLibSrcDir() + fileName + ".cxx";
+	File srcPath = getSrc(fileName + ".cxx");
 	
 	verifyVariable(variableName, variableToken, fileName, srcPath);
     }
@@ -167,11 +171,11 @@ public class TestObjectDeclarationSearchEngine extends TestLib{
          *                created
          */
     private void verifyVariable(String variableName,
-	    String variableToken,
-	    String fileName,
-	    String srcPath){
+				String variableToken,
+				String fileName,
+				File srcPath){
 	
-	TestfileTokenScanner scanner = new TestfileTokenScanner(new File(srcPath));
+	TestfileTokenScanner scanner = new TestfileTokenScanner(srcPath);
 	int variableLine = scanner.findTokenLine(variableToken);
 	Task task = (new DaemonBlockedAtSignal(fileName)).getMainTask();
 	DebugInfoFrame frame = DebugInfoStackFactory.createVirtualStackTrace(task);
diff --git a/frysk-core/frysk/hpd/ChangeLog b/frysk-core/frysk/hpd/ChangeLog
index b2e9439..bc0db18 100644
--- a/frysk-core/frysk/hpd/ChangeLog
+++ b/frysk-core/frysk/hpd/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-16  Andrew Cagney  <cagney@redhat.com>
 
+	* TestFhpdStepping.java: Use frysk.config.Prefix.
+
+	* TestHpdTestHarness.java: Use frysk.config.Prefix.
+
 	* TestFhpdStepping.java: Use Config.getPkgLibSrcDir().
 
 2008-04-15  Teresa Thomas  <tthomas@redhat.com>
diff --git a/frysk-core/frysk/hpd/TestFhpdStepping.java b/frysk-core/frysk/hpd/TestFhpdStepping.java
index d72da08..9fe1d35 100644
--- a/frysk-core/frysk/hpd/TestFhpdStepping.java
+++ b/frysk-core/frysk/hpd/TestFhpdStepping.java
@@ -41,7 +41,7 @@ package frysk.hpd;
 
 import java.io.File;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.testbed.TestfileTokenScanner;
 
 public class TestFhpdStepping extends TestLib {
@@ -55,8 +55,8 @@ public class TestFhpdStepping extends TestLib {
 	
 	e = new HpdTestbed();
 	
-	String source = Config.getPkgLibSrcDir() + "funit-stepping-asm.S";
-	this.scanner = new TestfileTokenScanner(new File(source));
+	File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
+	this.scanner = new TestfileTokenScanner(source);
 	int startLine = this.scanner.findTokenLine("_instructionStep_");
 	
 	e = HpdTestbed.run("funit-stepping-asm");
@@ -84,8 +84,8 @@ public class TestFhpdStepping extends TestLib {
 	if (unresolved(4914))
 	    return;
 	
-	String source = Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-stepping-asm.S";
-	this.scanner = new TestfileTokenScanner(new File(source));
+	File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
+	this.scanner = new TestfileTokenScanner(source);
 	int startLine = this.scanner.findTokenLine("_instructionStep_");
 	int endLine = this.scanner.findTokenLine("_lineStepEnd_");
 	
@@ -113,8 +113,8 @@ public class TestFhpdStepping extends TestLib {
 	if (unresolved(4914))
 	    return;
 	
-	String source = Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-stepping-asm.S";
-	this.scanner = new TestfileTokenScanner(new File(source));
+	File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
+	this.scanner = new TestfileTokenScanner(source);
 	int startLine = this.scanner.findTokenLine("_stepOverStart_");
 	int endLine = this.scanner.findTokenLine("_stepOverEnd_");
 	
@@ -142,8 +142,8 @@ public class TestFhpdStepping extends TestLib {
 	if (unresolved(4914))
 	    return;
 	
-	String source = Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-stepping-asm.S";
-	this.scanner = new TestfileTokenScanner(new File(source));
+	File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
+	this.scanner = new TestfileTokenScanner(source);
 	int startLine = this.scanner.findTokenLine("_stepOverStart_");
 	int endLine = this.scanner.findTokenLine("_stepOverEnd_");
 	
@@ -171,8 +171,8 @@ public class TestFhpdStepping extends TestLib {
 	if (unresolved(4914))
 	    return;
 	
-	String source = Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-stepping-asm.S";
-	this.scanner = new TestfileTokenScanner(new File(source));
+	File source = Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-stepping-asm.S");
+	this.scanner = new TestfileTokenScanner(source);
 	int startLine = this.scanner.findTokenLine("_stepOutStart_");
 	int endLine = this.scanner.findTokenLine("_stepOverEnd_");
 	
diff --git a/frysk-core/frysk/rt/BreakpointManager.java b/frysk-core/frysk/rt/BreakpointManager.java
index 759acba..bf4233d 100644
--- a/frysk-core/frysk/rt/BreakpointManager.java
+++ b/frysk-core/frysk/rt/BreakpointManager.java
@@ -45,7 +45,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Observable;
 import java.util.TreeMap;
-
+import java.io.File;
 import frysk.proc.Action;
 import frysk.proc.Proc;
 import frysk.proc.ProcTasksAction;
@@ -153,6 +153,19 @@ public class BreakpointManager extends Observable {
     }
 
     /**
+     * Create a line breakpoint that is not associated with any
+     * process.
+     * @param fileName the file
+     * @param lineNumber line in the file
+     * @param column column number in the file
+     * @return LineBreakpoint object
+     */
+    public LineBreakpoint addLineBreakpoint(File fileName,
+					    int line, int column) {
+	return addLineBreakpoint(fileName.getPath(), line, column);
+    }
+
+    /**
      * Create a symbol breakpoint not associated with any process
      * @param symbol the symbol to breakpoint at
      * @return FunctionBreakpoint object
diff --git a/frysk-core/frysk/rt/ChangeLog b/frysk-core/frysk/rt/ChangeLog
index b57f931..5f2319f 100644
--- a/frysk-core/frysk/rt/ChangeLog
+++ b/frysk-core/frysk/rt/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-16  Andrew Cagney  <cagney@redhat.com>
+
+	* LineBreakpoint.java (LineBreakpoint(int,File,int,int)): New.
+	* TestDisplayValue.java: Use frysk.config.Prefix.
+	* TestUpdatingDisplayValue.java: Ditto.
+	* BreakpointManager.java (addLineBreakpoint(File,int,int)): New.
+
 2008-04-06  Petr Machata  <pmachata@redhat.com>
 
 	* PLTBreakpoint.java: New class.
diff --git a/frysk-core/frysk/rt/LineBreakpoint.java b/frysk-core/frysk/rt/LineBreakpoint.java
index d2dae4f..d9ec7ea 100644
--- a/frysk-core/frysk/rt/LineBreakpoint.java
+++ b/frysk-core/frysk/rt/LineBreakpoint.java
@@ -44,9 +44,8 @@ import java.io.PrintWriter;
 import java.util.LinkedList;
 import java.util.ListIterator;
 import frysk.rsl.Log;
-
+import java.io.File;
 import lib.dwfl.DwflLine;
-
 import frysk.dwfl.DwflCache;
 import frysk.proc.Task;
 
@@ -57,6 +56,11 @@ public class LineBreakpoint extends SourceBreakpoint {
   private int lineNumber;
   private int column;
     
+    public LineBreakpoint(int id, File fileName,
+			  int lineNumber, int column) {
+	this(id, fileName.getPath(), lineNumber, column);
+    }
+
   public LineBreakpoint(int id, String fileName, int lineNumber, int column) 
   {
     super(id);
diff --git a/frysk-core/frysk/rt/TestDisplayValue.java b/frysk-core/frysk/rt/TestDisplayValue.java
index 27d0a64..0db1014 100644
--- a/frysk-core/frysk/rt/TestDisplayValue.java
+++ b/frysk-core/frysk/rt/TestDisplayValue.java
@@ -43,7 +43,7 @@ import java.util.LinkedList;
 import java.util.Observable;
 import java.util.Observer;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.proc.Manager;
 import frysk.proc.Proc;
 import frysk.proc.Task;
@@ -89,8 +89,8 @@ public class TestDisplayValue
      *    x = 1; <-- First breakpoint
      */
     LineBreakpoint brk1 = 
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                 49, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    49, 0);
     brk1.addObserver(new BreakpointBlocker());
     bpManager.enableBreakpoint(brk1, myTask);
   
@@ -123,8 +123,8 @@ public class TestDisplayValue
      *    y = 2; <-- Second breakpoint
      */
     LineBreakpoint brk2 =
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  51, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    51, 0);
     brk2.addObserver(new BreakpointBlocker());
     brk2.enableBreakpoint(myTask, steppingEngine);
     
@@ -163,8 +163,8 @@ public class TestDisplayValue
      *    bar(x);
      */
     LineBreakpoint brk1 = 
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  51, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    51, 0);
     brk1.addObserver(new BreakpointBlocker());
     bpManager.enableBreakpoint(brk1, myTask);
   
@@ -193,8 +193,8 @@ public class TestDisplayValue
      *    bar(x);
      */
     LineBreakpoint brk2 =
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  53, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    53, 0);
     brk2.addObserver(new BreakpointBlocker());
     brk2.enableBreakpoint(myTask, steppingEngine);
     
@@ -225,8 +225,8 @@ public class TestDisplayValue
      * Add the first breakpoint:
      */
     LineBreakpoint brk1 = 
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                 63, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    63, 0);
     brk1.addObserver(new BreakpointBlocker());
     bpManager.enableBreakpoint(brk1, myTask);
   
@@ -250,8 +250,8 @@ public class TestDisplayValue
      * Add the second breakpoint:
      */
     LineBreakpoint brk2 =
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  49, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    49, 0);
     brk2.addObserver(new BreakpointBlocker());
     brk2.enableBreakpoint(myTask, steppingEngine);
     
@@ -293,8 +293,8 @@ public class TestDisplayValue
      * Add the first breakpoint:
      */
     LineBreakpoint brk1 = 
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                 48, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    48, 0);
     brk1.addObserver(new BreakpointBlocker());
     bpManager.enableBreakpoint(brk1, myTask);
   
@@ -318,8 +318,8 @@ public class TestDisplayValue
      * Add the second breakpoint:
      */
     LineBreakpoint brk2 =
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  63, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    63, 0);
     brk2.addObserver(new BreakpointBlocker());
     brk2.enableBreakpoint(myTask, steppingEngine);
     
@@ -348,8 +348,8 @@ public class TestDisplayValue
      * Add the first breakpoint:
      */
     LineBreakpoint brk1 = 
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                 52, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    52, 0);
     brk1.addObserver(new BreakpointBlocker());
     bpManager.enableBreakpoint(brk1, myTask);
   
@@ -373,8 +373,8 @@ public class TestDisplayValue
      * Add the second breakpoint:
      */
     LineBreakpoint brk2 =
-      bpManager.addLineBreakpoint(Config.getRootSrcDir() + "frysk-core/frysk/pkglibdir/funit-rt-varchange.c",
-                                  63, 0);
+	bpManager.addLineBreakpoint(Prefix.sourceFile("frysk-core/frysk/pkglibdir/funit-rt-varchange.c"),
+				    63, 0);
     brk2.addObserver(new BreakpointBlocker());
     brk2.enableBreakpoint(myTask, steppingEngine);
     
@@ -393,7 +393,7 @@ public class TestDisplayValue
   private BreakpointManager createDaemon()
   {
       //  Start the daemon process
-      process = new DaemonBlockedAtEntry(Config.getPkgLibFile("funit-rt-varchange"));
+      process = new DaemonBlockedAtEntry(Prefix.pkgLibFile("funit-rt-varchange"));
     
     myTask = process.getMainTask();
     myProc = myTask.getProc();
diff --git a/frysk-core/frysk/rt/TestUpdatingDisplayValue.java b/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
index 5405764..61382fe 100644
--- a/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
+++ b/frysk-core/frysk/rt/TestUpdatingDisplayValue.java
@@ -43,7 +43,7 @@ import java.util.LinkedList;
 import java.util.Observable;
 import java.util.Observer;


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


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-04-17  3:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-04-17  3:41 [SCM] master: Delete Config.getRootSrcDir and Config.getPkgLibSrcDir cagney

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).