mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

bug 409651: MinGW language settings provider provides duplicate include paths

Browse source
This commit is contained in:
Andrew Gvozdev 2013-06-01 07:20:46 -04:00
parent e8cb904f9c
commit 4ead47e948
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/GCCBuiltinSpecsDetectorTest.java
View file

@ -401,6 +401,36 @@ public class GCCBuiltinSpecsDetectorTest extends BaseTestCase {
assertEquals(1, entries.size());
}
/**
* Test parsing of include directives included multiple times.
*/
public void testGCCBuiltinSpecsDetector_Includes_Duplicates() throws Exception {
// Create model project and folders to test
String projectName = getName();
IProject project = ResourceHelper.createCDTProject(projectName);
IPath tmpPath = ResourceHelper.createTemporaryFolder();
ResourceHelper.createFolder(project, "/usr/include");
String loc = tmpPath.toString();
MockGCCBuiltinSpecsDetector detector = new MockGCCBuiltinSpecsDetector();
detector.startup(null, null);
detector.startupForLanguage(null);
detector.processLine("#include <...> search starts here:");
detector.processLine(" "+loc+"/usr/include");
detector.processLine(" "+loc+"/usr/include");
detector.processLine(" "+loc+"/usr/include/");
detector.processLine(" "+loc+"/usr/include/../include");
detector.processLine("End of search list.");
detector.shutdownForLanguage();
detector.shutdown();
List<ICLanguageSettingEntry> entries = detector.getSettingEntries(null, null, null);
int index = 0;
assertEquals(new CIncludePathEntry(loc+"/usr/include", ICSettingEntry.BUILTIN | ICSettingEntry.READONLY), entries.get(index++));
assertEquals(index, entries.size());
}
/**
* Test parsing of include directives for Cygwin for global provider.
*/

6
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java
View file

@ -700,7 +700,11 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
// Built-in specs detectors collect entries not per line but for the whole output
// so collect them to save later when output finishes
if (entries != null) {
detectedSettingEntries.addAll(entries);
for (ICLanguageSettingEntry entry : entries) {
if (!detectedSettingEntries.contains(entry)) {
detectedSettingEntries.add(entry);
}
}
}
}