From ed09e98990d56f66755b13705f757c1b26598d40 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 11 Oct 2009 02:27:22 +0000 Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite wrong condition ignoring failures after passed check - fixed --- .../managedbuilder/testplugin/ManagedBuildTestHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java index 1c167c45146..fb5e1e15854 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java @@ -403,7 +403,7 @@ public class ManagedBuildTestHelper { IPath benchmarkFileLocation = benchmarkLocationBase.append("Benchmarks").append(files[i]); if (isMakefile(testFileLocation)) { if (compareMakefiles(testFileLocation, benchmarkFileLocation)) { - return true; + continue; } } StringBuffer testBuffer = readContentsStripLineEnds(project, testFileLocation); @@ -584,8 +584,8 @@ public class ManagedBuildTestHelper { } static public boolean compareBenchmarks(IFile tFile, IFile bmFile) { - IPath tFileLocation = new Path(tFile.toString()); - IPath bmFileLocation = new Path(bmFile.toString()); + IPath tFileLocation = tFile.getLocation(); + IPath bmFileLocation = bmFile.getLocation(); if (isMakefile(tFileLocation)) { if (compareMakefiles(tFileLocation, bmFileLocation)) { return true;