From dc82b160c32a383379c3b71fac9787bef8c4c2ba Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Wed, 23 May 2007 10:00:25 +0000 Subject: [PATCH] Bug #188455 --- .../core/tests/ManagedBuildMacrosTests.java | 8 ++++---- .../managedbuilder/ui/properties/BuildToolSettingUI.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java index f0a1e82f4cd..d4601aca93a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildMacrosTests.java @@ -422,7 +422,7 @@ public class ManagedBuildMacrosTests extends TestCase { // doInit(); // ms = mp.getSuppliers(IBuildMacroProvider.CONTEXT_WORKSPACE, worksp); // assertNotNull(ms); -// String[] lst = {"SCHEISE", "MERDE", "SHIT"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ +// String[] lst = {"AAA", "BBB", "CCC"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // assertTrue(addMacro("LST", IBuildMacro.VALUE_TEXT_LIST, lst, //$NON-NLS-1$ // IBuildMacroProvider.CONTEXT_WORKSPACE, worksp)); // assertTrue(addMacro("ONE", IBuildMacro.VALUE_TEXT, "EIN", //$NON-NLS-1$ //$NON-NLS-2$ @@ -461,9 +461,9 @@ public class ManagedBuildMacrosTests extends TestCase { // String e = mp.resolveValue("${one} - ${Two} - ${THREE} -> ${lst}", UNKNOWN, LISTSEP, //$NON-NLS-1$ // IBuildMacroProvider.CONTEXT_CONFIGURATION, cfgs[0]); // -// assertEquals(a, "EIN - ZWEI - DREI -> SCHEISE|MERDE|SHIT"); //$NON-NLS-1$ -// assertEquals(b, "EIN - ZWEI - -> SCHEISE|MERDE|SHIT"); //$NON-NLS-1$ -// assertEquals(c, "EIN - - -> SCHEISE|MERDE|SHIT"); //$NON-NLS-1$ +// assertEquals(a, "EIN - ZWEI - DREI -> AAA|BBB|CCC"); //$NON-NLS-1$ +// assertEquals(b, "EIN - ZWEI - -> AAA|BBB|CCC"); //$NON-NLS-1$ +// assertEquals(c, "EIN - - -> AAA|BBB|CCC"); //$NON-NLS-1$ // assertEquals(d, "nested L1-L2-L3-L4-L3-L2-L1"); //$NON-NLS-1$ // assertEquals(e, " - - -> "); //$NON-NLS-1$ // } catch (BuildMacroException e) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java index bf69f9a9c6d..5bc93018eca 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingUI.java @@ -105,7 +105,7 @@ public class BuildToolSettingUI extends AbstractToolSettingUI { public BuildToolSettingUI(AbstractCBuildPropertyTab page, IResourceInfo info, ITool _tool) { // Cache the configuration and tool this page is for - //TODO: SHIT + //TODO: super(info); this.fTool = _tool; buildPropPage = page;