diff -r bfb3ab3f70f2 -r 5d967503c150 project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView2.java --- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView2.java Wed Dec 02 15:02:05 2009 -0600 +++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/model/TestMMPView2.java Wed Dec 02 15:23:23 2009 -0600 @@ -132,11 +132,11 @@ IMMPView view = model.createView(mmpConfig); IPath[] srcPaths = view.getEffectiveSourcePaths(); // important to be relative - assertEquals(base.makeRelative().append("symbian/9.1/S60_3rd/S60Ex/Hello/src"), srcPaths[0]); + assertEquals(base.makeRelative().setDevice(null).append("symbian/9.1/S60_3rd/S60Ex/Hello/src"), srcPaths[0]); IPath src = view.getSources().get(0); // important to be relative - assertEquals(base.makeRelative().append("symbian/9.1/S60_3rd/S60Ex/Hello/src/foo.cpp"), src); + assertEquals(base.makeRelative().setDevice(null).append("symbian/9.1/S60_3rd/S60Ex/Hello/src/foo.cpp"), src); } } @@ -1214,8 +1214,9 @@ } catch (InvalidDriveInMMPPathException e) { view.getUserIncludes().add(e.getPathNoDevice()); } + IPath fullpath = new Path(getTokenAbsolutePath()).setDevice(null).append("temp"); commitTest(view, - "USERINCLUDE ..\\group \\temp\n"); + "USERINCLUDE ..\\group " + toDosPath(fullpath) + "\n"); } public void testBug2817() {