Workaround to get DependencyTests working on integration builds.

2 files changed, 12 insertions, 2 deletions

diff --git a/core/org.eclipse.cdt.core.tests/ChangeLog b/core/org.eclipse.cdt.core.tests/ChangeLog
index e7629f6896a..23d67844ddf 100644
--- a/core/org.eclipse.cdt.core.tests/ChangeLog
+++ b/core/org.eclipse.cdt.core.tests/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-09 Bogdan Gheorghe

+	Workaround to get DependencyTests working on integration builds. 

+	

 2004-03-03 John Camelon

 	Updated tests to deal with IASTUsingDeclaration interface changes.  

 

diff --git a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
index 235cf3630ae..24900b25e8b 100644
--- a/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
+++ b/core/org.eclipse.cdt.core.tests/indexer/org/eclipse/cdt/core/indexer/tests/DependencyTests.java
@@ -10,6 +10,8 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
@@ -583,11 +585,16 @@ import org.eclipse.core.runtime.Platform;
 
 
    private String[] convertToLocalPath(String[] model) {
-	   IPath defaultPath = new Path("");//Platform.getInstanceLocation();
+	   IPath defaultPath = Platform.getLocation();
+	   String pathString = defaultPath.toOSString();
+       if (pathString.charAt(pathString.length() - 1) == '\\')
+       {
+       	 pathString = pathString.substring(0, pathString.length() - 1);
+       }
 	   String[] tempLocalArray = new String[model.length];
 	   for (int i=0;i<model.length;i++){
 		   StringBuffer buffer = new StringBuffer();
-		   buffer.append(defaultPath.toOSString());
+		   buffer.append(pathString);
 		   buffer.append(model[i]);
 		   tempLocalArray[i]=buffer.toString();
 	   }