# HG changeset patch
# User dadubrow
# Date 1242835092 18000
# Node ID 4ba2a4d74f9be1d9e2a0c679ef5d35362e89d10b
# Parent  ee2f99c3afcb4dcfee8107675b689a9a41d33119# Parent  5376c680dd66c39eee72937c35df1d2395d2ff2b
merge commit

diff -r 5376c680dd66 -r 4ba2a4d74f9b builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Wed May 20 10:49:30 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Wed May 20 10:58:12 2009 -0500
@@ -1347,7 +1347,7 @@
 								// add the absolute workspace path to the folder directly under the project.
 								// ideally we'd be more precise but then CDT creates a C folder named Foo\Bar,
 								// rather than just expanding Foo and then seeing bar a C source folder.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 
@@ -1358,7 +1358,7 @@
 								// add the absolute workspace path to the folder directly under the project.
 								// ideally we'd be more precise but then CDT creates a C folder named Foo\Bar,
 								// rather than just expanding Foo and then seeing bar a C source folder.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 
@@ -1366,7 +1366,7 @@
 							IPath fullPath = helper.convertMMPToWorkspace(EMMPPathContext.USERINCLUDE, path);
 							if (fullPath != null) {
 								// add the absolute workspace path to the folder directly under the project.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 						
@@ -1374,7 +1374,7 @@
 							IPath fullPath = helper.convertMMPToWorkspace(EMMPPathContext.SYSTEMINCLUDE, path);
 							if (fullPath != null) {
 								// add the absolute workspace path to the folder directly under the project.
-								topLevelSourcePaths.add(fullPath.uptoSegment(2).makeAbsolute());
+								topLevelSourcePaths.add(fullPath./*uptoSegment(2).*/makeAbsolute());
 							}
 						}
 						
diff -r 5376c680dd66 -r 4ba2a4d74f9b connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/TestFilter.java
--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/TestFilter.java	Wed May 20 10:49:30 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/extensions/TestFilter.java	Wed May 20 10:58:12 2009 -0500
@@ -33,8 +33,8 @@
 	private static List<String> serviceIds = new ArrayList<String>();
 	private static List<Pair<String, String>> connectedServiceIdPairs = new ArrayList<Pair<String,String>>();
 	
-	public static boolean isTest = true;
-
+	public static boolean isTest = Boolean.parseBoolean(System.getenv("remoteconnections.tests"));
+	
 	public static void reset() {
 		connectionTypeIds.clear();
 		serviceIds.clear();