From f2512325cc61bf6775af60496804cd6efce6dfa8 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Fri, 16 Oct 2009 17:30:49 +0000
Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite
 Ignoring empty macros during comparison

---
 .../testplugin/ManagedBuildTestHelper.java    | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 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 feff7f55aef..7b498a84bb6 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
@@ -463,16 +463,24 @@ public class ManagedBuildTestHelper {
 		final String IFNEQ_PATTERN = "ifneq \\(\\$\\(strip \\$\\(.*\\)\\),\\)";
 		final String INCLUDE_PATTERN = "-include \\$\\(.*\\)";
 		final String MACRO_PATTERN = "\\S* :=.*";
+		final String EMPTY_MACRO_PATTERN = "\\S* :=";
 		ArrayList<String> testArray = getContents(testFile);
 		ArrayList<String> benchmarkArray = getContents(benchmarkFile);
-		if (testArray.size()!=benchmarkArray.size()) {
-			System.out.println("testArray.size="+testArray.size()+ " while benchmarkArray.size="+benchmarkArray.size());
-			return false;
-		}
 		
 		Set<String> testNotMatchingLines = new TreeSet<String>();
 		Set<String> benchNotMatchingLines = new TreeSet<String>();
-		for (int i=0;i<benchmarkArray.size();i++) {
+		Set<String> extraLines = new TreeSet<String>();
+		for (int i=0;i<benchmarkArray.size() || i<testArray.size();i++) {
+			if (!(i<benchmarkArray.size())) {
+				System.out.println(testFile.lastSegment()+": extra line =["+testArray.get(i)+ "] not in benchmark. File "+testFile);
+				extraLines.add(testArray.get(i));
+				continue;
+			}
+			if (!(i<testArray.size())) {
+				System.out.println(testFile.lastSegment()+": missing line =["+benchmarkArray.get(i)+ "] comparing to benchmark. File "+testFile);
+				extraLines.add(benchmarkArray.get(i));
+				continue;
+			}
 			String testLine = testArray.get(i);
 			String benchmarkLine = benchmarkArray.get(i);
 			if (!testLine.equals(benchmarkLine)) {
@@ -515,6 +523,19 @@ public class ManagedBuildTestHelper {
 				}
 			}
 		}
+		if (testArray.size()!=benchmarkArray.size()) {
+			System.out.println("testArray.size="+testArray.size()+ " while benchmarkArray.size="+benchmarkArray.size());
+			// Ignore benign differences
+			for (String line : extraLines) {
+				if (line==null || line.length()==0) {
+					continue;
+				}
+				if (line.matches(EMPTY_MACRO_PATTERN)) {
+					continue;
+				}
+				return false;
+			}
+		}
 		
 		// Check if all collected lines match irrespective of order 
 		String[] testNotMatchingLinesArray = testNotMatchingLines.toArray(new String[0]);