mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
bug 212596: JUnit failures in cdt.managedbuilder.test.suite
wrong condition ignoring failures after passed check - fixed
This commit is contained in:
parent
a183b1abbd
commit
ed09e98990
1 changed files with 3 additions and 3 deletions
|
@ -403,7 +403,7 @@ public class ManagedBuildTestHelper {
|
||||||
IPath benchmarkFileLocation = benchmarkLocationBase.append("Benchmarks").append(files[i]);
|
IPath benchmarkFileLocation = benchmarkLocationBase.append("Benchmarks").append(files[i]);
|
||||||
if (isMakefile(testFileLocation)) {
|
if (isMakefile(testFileLocation)) {
|
||||||
if (compareMakefiles(testFileLocation, benchmarkFileLocation)) {
|
if (compareMakefiles(testFileLocation, benchmarkFileLocation)) {
|
||||||
return true;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
StringBuffer testBuffer = readContentsStripLineEnds(project, testFileLocation);
|
StringBuffer testBuffer = readContentsStripLineEnds(project, testFileLocation);
|
||||||
|
@ -584,8 +584,8 @@ public class ManagedBuildTestHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
static public boolean compareBenchmarks(IFile tFile, IFile bmFile) {
|
static public boolean compareBenchmarks(IFile tFile, IFile bmFile) {
|
||||||
IPath tFileLocation = new Path(tFile.toString());
|
IPath tFileLocation = tFile.getLocation();
|
||||||
IPath bmFileLocation = new Path(bmFile.toString());
|
IPath bmFileLocation = bmFile.getLocation();
|
||||||
if (isMakefile(tFileLocation)) {
|
if (isMakefile(tFileLocation)) {
|
||||||
if (compareMakefiles(tFileLocation, bmFileLocation)) {
|
if (compareMakefiles(tFileLocation, bmFileLocation)) {
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue