Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build/org.eclipse.cdt.managedbuilder.core.tests
diff options
context:
space:
mode:
authorVladimir Hirsl2005-02-18 19:35:32 +0000
committerVladimir Hirsl2005-02-18 19:35:32 +0000
commit2aae3af85f6e18eafd1daf6b3b633c0efda2967f (patch)
tree7b6cc3880939c6923236baf1c179bae76d04320c /build/org.eclipse.cdt.managedbuilder.core.tests
parent4568efb20e4e363f02d938665d07ba981d5110e2 (diff)
downloadorg.eclipse.cdt-2aae3af85f6e18eafd1daf6b3b633c0efda2967f.tar.gz
org.eclipse.cdt-2aae3af85f6e18eafd1daf6b3b633c0efda2967f.tar.xz
org.eclipse.cdt-2aae3af85f6e18eafd1daf6b3b633c0efda2967f.zip
Fix for 85056: Discovered Inclusions broken on for Managed Make projects
and 85229: Problem with scannerInfoCollector attribute in the toolChain schema of MBS. Replaced ToolChain's attribute scannerInfoCollector with ScannerConfigDiscoveredProfileId in managed builder extension point definition schema. Discovery of compiler's internal scanner info for a manged project now uses specified SCD profile. On Windows, specified profile calls cygpath to translate discovered paths.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core.tests')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml12
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java14
2 files changed, 10 insertions, 16 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 367cbc258d3..f7a4af5e633 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -1213,7 +1213,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.exe.debug"
name="Dbg ToolChain"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
@@ -1280,7 +1280,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.exe.release"
name="Rel ToolChain"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
@@ -1354,7 +1354,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.so.debug"
name="so Debug ToolChain"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
@@ -1435,7 +1435,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.so.release"
name="so Release ToolChain"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
@@ -1523,7 +1523,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.lib.debug"
name="Dbg TC"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
@@ -1588,7 +1588,7 @@
<toolChain
id="cdt.managedbuild.toolchain.testgnu.lib.release"
name="Rel TC"
- scannerInfoCollector="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector"
+ scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
<targetPlatform
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java
index 165ac9e7542..a1e18071320 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedBuildCoreTests.java
@@ -262,7 +262,7 @@ public class ManagedBuildCoreTests extends TestCase {
String expectedArguments = "-k";
String[] expectedBuilderName = {"so Debug Builder",
"so Release Builder"};
- String expectedScannerInfo = "org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector";
+ String expectedScannerConfigDiscoveryProfileId = "org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile";
String[] expectedToolChainName = {"so Debug ToolChain",
"so Release ToolChain"};
String[] expectedToolId1 = {"cdt.managedbuild.tool.testgnu.c.linker.so.debug",
@@ -332,10 +332,7 @@ public class ManagedBuildCoreTests extends TestCase {
assertEquals(expectedParserId, configs[iconfig].getErrorParserIds());
assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList])));
assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList));
- IConfigurationElement element = toolChain.getScannerInfoCollectorElement();
- if (element != null) {
- assertEquals(element.getAttribute(IToolChain.SCANNER_INFO_ID), expectedScannerInfo);
- }
+ assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId());
// Fetch and check platform
//
@@ -467,7 +464,7 @@ public class ManagedBuildCoreTests extends TestCase {
String expectedArguments = "-k";
String[] expectedBuilderName = {"Dbg B",
"Rel B"};
- String expectedScannerInfo = "org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGCCScannerInfoCollector";
+ String expectedScannerConfigDiscoveryProfileId = "org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile";
String[] expectedToolId1 = {"cdt.managedbuild.tool.testgnu.cpp.compiler.lib.debug",
"cdt.managedbuild.tool.testgnu.cpp.compiler.lib.release"};
String expectedSuperToolId1 = "cdt.managedbuild.tool.testgnu.cpp.compiler";
@@ -532,10 +529,7 @@ public class ManagedBuildCoreTests extends TestCase {
assertEquals(expectedParserId, configs[iconfig].getErrorParserIds());
assertTrue(Arrays.equals(toolChain.getOSList(), (String[]) expectedOSListarr.toArray(new String[expectedSizeOSList])));
assertTrue(Arrays.equals(toolChain.getArchList(), expectedArchList));
- IConfigurationElement element = toolChain.getScannerInfoCollectorElement();
- if (element != null) {
- assertEquals(element.getAttribute(IToolChain.SCANNER_INFO_ID), expectedScannerInfo);
- }
+ assertEquals(expectedScannerConfigDiscoveryProfileId, toolChain.getScannerConfigDiscoveryProfileId());
// Fetch and check platform
//

Back to the top