1 files changed, 27 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
index 93bb40f1c5e..e8f16b813be 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Intel Corporation and others.
+ * Copyright (c) 2007, 2012 Intel Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,9 @@
  * Contributors:
  * Intel Corporation - Initial API and implementation
  * Christian Walther (Indel AG) - [335344] test for changing language IDs
+ * Raphael Zulliger (Indel AG) - [284699][237771] test having macros with same 
+ *                               name but different values in same project 
+ *                               configuration
  *******************************************************************************/
 package org.eclipse.cdt.core.settings.model;
 
@@ -86,11 +89,33 @@ public class TestExtSettingsProvider extends CExternalSettingProvider {
 		)
 	};
 
+	private static CExternalSetting[] SETTINGS_5 = new CExternalSetting[]{
+		new CExternalSetting(
+				new String[]{
+						"org.eclipse.cdt.core.g++"
+				},
+				null, null,
+				new ICSettingEntry[]{
+						new CMacroEntry("THE_MACRO", "", 0)
+				}
+		),
+		new CExternalSetting(
+				new String[]{
+						"org.eclipse.cdt.core.assembly"
+				},
+				null, null,
+				new ICSettingEntry[]{
+						new CMacroEntry("THE_MACRO", "TheValue", 0)
+				}
+		)
+	};
+		
 	public static final CExternalSetting[][] SETTINGS_VARIANTS = new CExternalSetting[][]{
 								SETTINGS_1, 
 								SETTINGS_2,
 								SETTINGS_3,
-								SETTINGS_4};
+								SETTINGS_4,
+								SETTINGS_5};
 
 	private static int variantNum;