Fix for 196823, JUnit failures of scanner discovery

3 files changed, 4 insertions, 25 deletions

diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java
index 9de787e936f..054aa50f666 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/BaseBOPConsoleParserTests.java
@@ -81,7 +81,7 @@ public abstract class BaseBOPConsoleParserTests extends BaseTestCase {
 	}
 	
 	public void testParsingSymbolDefinitions_bug80271() {
-		fOutputParser.processLine("gcc -DMACRO1 -I ..\\inc -c ..\\source\\source.c");	// PR 80271 //$NON-NLS-1$
+		fOutputParser.processLine("gcc -DMACRO1 -I ..\\inc -c ..\\perfilescdtest\\source.c");	// PR 80271 //$NON-NLS-1$
 
         List sumSymbols = fCollector.getCollectedScannerInfo(null, ScannerInfoTypes.SYMBOL_DEFINITIONS); 
 		assertTrue(sumSymbols.contains("MACRO1")); //$NON-NLS-1$
@@ -90,14 +90,14 @@ public abstract class BaseBOPConsoleParserTests extends BaseTestCase {
 	
 	public void testParsingUnbalancedDoubleQuote_Bug186065() throws Exception {
 		fOutputParser.processLine("../src/bug186065.cc:8: error: missing terminating \" character");	// PR 80271 //$NON-NLS-1$
-		fOutputParser.processLine("gcc -DBUG186065_IS_FIXED"); //$NON-NLS-1$
+		fOutputParser.processLine("gcc -DBUG186065_IS_FIXED test.c"); //$NON-NLS-1$
 
         List sumSymbols = fCollector.getCollectedScannerInfo(null, ScannerInfoTypes.SYMBOL_DEFINITIONS); 
 		assertTrue(sumSymbols.contains("BUG186065_IS_FIXED")); //$NON-NLS-1$
 		assertTrue(sumSymbols.size() == 1);
 	}
 	
-	public void _testCompilerCommand_bug194394() throws Exception {
+	public void testCompilerCommand_bug194394() throws Exception {
 		fOutputParser.processLine("/usr/bin/gcc -DA test1.c"); //$NON-NLS-1$
 		fOutputParser.processLine("/usr/gcc-installs/gcc -DB test2.c"); //$NON-NLS-1$
 		fOutputParser.processLine("/usr/gcc/gcc -DC test3.c"); //$NON-NLS-1$
diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java
index a884fb037db..af42b9eef80 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java
@@ -55,19 +55,4 @@ public class GCCPerFileBOPConsoleParserTests extends BaseBOPConsoleParserTests {
 			CProjectHelper.delete(fCProject);
 		}
 	}
-	
-	public void testParsingSymbolDefinitions() {}
-	public void _testParsingSymbolDefinitions() {
-		super.testParsingSymbolDefinitions();
-	}
-
-	public void testParsingSymbolDefinitions_bug80271() {}
-	public void _testParsingSymbolDefinitions_bug80271() {
-		super.testParsingSymbolDefinitions_bug80271();
-	}
-
-	public void testParsingUnbalancedDoubleQuote_Bug186065() {}
-	public void _testParsingUnbalancedDoubleQuote_Bug186065() throws Exception {
-		super.testParsingUnbalancedDoubleQuote_Bug186065();
-	}
 }
diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java
index 67554881cf1..4f5802f31db 100644
--- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java
+++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java
@@ -58,7 +58,7 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests
 		fOutputParser.processLine("gcc '-I /with spaces 1' -I'/with spaces 2' -c test.c"); // dirs with spaces 1,2 //$NON-NLS-1$
 		fOutputParser.processLine("gcc \"-I /with spaces 3\" -I \"/with spaces 4\" -c test.c"); // dirs with spaces 3,4 //$NON-NLS-1$
 		fOutputParser.processLine("gcc -I /with\\ spaces\\ 5 -c test.c"); // dirs with spaces 5 //$NON-NLS-1$
-		fOutputParser.processLine("gcc -I '\\\\server1\\include' '-I\\\\server2\\include' -I \"\\\\server3\\include\" -c test.c"); // UNC paths //$NON-NLS-1$
+		fOutputParser.processLine("gcc -I '\\\\server1\\include' '-I\\\\server2\\include' -I \"\\\\\\\\server3\\\\include\" -c test.c"); // UNC paths //$NON-NLS-1$
 		fOutputParser.processLine("gcc -I //server4/include -I '//server5/include' '-I//server6/include' -c test.c"); // UNC paths //$NON-NLS-1$
 		fOutputParser.processLine("gcc -I \\"); //$NON-NLS-1$
 		fOutputParser.processLine("/multiline\\"); //$NON-NLS-1$
@@ -91,10 +91,4 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests
 		assertTrue(sumIncludes.contains("/multiline/dir")); //$NON-NLS-1$
 		assertTrue(sumIncludes.size() == 24);
 	}
-
-	public void testCommandsWithSemicolon_bug194394() {}
-	public void _testCommandsWithSemicolon_bug194394() throws Exception {
-		super.testCommandsWithSemicolon_bug194394();
-	}
-
 }