--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/ProjectPropertiesTest.java Fri Dec 04 15:53:08 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/ProjectPropertiesTest.java Fri Dec 04 16:16:59 2009 -0600
@@ -101,7 +101,7 @@
// get a new copy of the info to make sure the changes we really applied
ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project);
- assertEquals(BLD_INF_PATH, cpi.getProjectRelativeBldInfPath().toOSString());
+ assertEquals(BLD_INF_PATH, cpi.getProjectRelativeBldInfPath().toPortableString());
assertEquals(stockBuildConfigs.get(0).getDisplayString(), cpi.getDefaultBuildConfigName());
assertTrue(cpi.isBuildingFromInf());
assertEquals(2, cpi.getInfBuildComponents().size());
--- a/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/CarbideErrorParserTestHarness.java Fri Dec 04 15:53:08 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder.test/src/com/nokia/carbide/cdt/builder/test/errorParsers/CarbideErrorParserTestHarness.java Fri Dec 04 16:16:59 2009 -0600
@@ -245,7 +245,7 @@
} else {
if (result.externalPath.equals(expected.externalPath) == false) {
// note: for some reason, on Unix, relative paths become full paths
- if (HostOS.IS_UNIX && result.externalPath.makeRelative().equals(expected.externalPath.makeRelative())) {
+ if (result.externalPath.makeRelative().equals(expected.externalPath.makeRelative())) {
// fine
} else {
Assert.assertEquals("External path string from IDE marker", expected.externalPath, result.externalPath);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ProjectExportsGatherer.java Fri Dec 04 15:53:08 2009 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ProjectExportsGatherer.java Fri Dec 04 16:16:59 2009 -0600
@@ -338,9 +338,7 @@
* @param path
*/
protected boolean isAbsoluteDrivePath(IPath path) {
- if (path.isAbsolute())
- return true;
- if (isWin32DrivePath(path))
+ if ((HostOS.IS_WIN32 && path.isAbsolute()) || isWin32DrivePath(path))
return true;
return false;
}
--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/workspace/TestWorkspaceModelProvider.java Fri Dec 04 15:53:08 2009 -0600
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/workspace/TestWorkspaceModelProvider.java Fri Dec 04 16:16:59 2009 -0600
@@ -472,6 +472,7 @@
public void testExternalModification_bug3557() throws Exception {
// make the mmp
IPath fullMmpPath = new Path(getTokenAbsolutePath()).append("tempmodel.mmp");
+ fullMmpPath.toFile().getParentFile().mkdirs();
String text =
"START BITMAP foo.mbm\n"+