From 1821d8be1be9a90ce4d00bd44435107d944b1066 Mon Sep 17 00:00:00 2001
From: James Blackburn <jamesblackburn+eclipse@gmail.com>
Date: Wed, 26 Jan 2011 18:09:48 +0000
Subject: [PATCH] Bug 335476 - CDT build doesn't notice cdt.core.prefs is
 modified externally. Test added.

---
 .../builderTests/regressions/README.txt       |   3 +
 .../builderTests/regressions/bug_335476.zip   | Bin 0 -> 5086 bytes
 .../core/regressions/Bug_335476.java          | 101 ++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/bug_335476.zip
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_335476.java

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/README.txt b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/README.txt
index 3a88835e59a..58b16439453 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/README.txt
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/README.txt
@@ -2,3 +2,6 @@
 helloworldC.zip:
   Basic standard Linux GCC C HelloWorld ManagedBuild Project template.
   Contains Debug + Release configurations.
+
+bug_335476.zip:
+  Test for noticing environment variable changes.
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/bug_335476.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/builderTests/regressions/bug_335476.zip
new file mode 100644
index 0000000000000000000000000000000000000000..4537cd3651329508461ccf6464573bbbb1d14a0c
GIT binary patch
literal 5086
zcmd5=XH-*JxQ+Axp(9nKNK*u)gVH-lmCyx32{0m&UL<tsML>F!E?q*CNUuSvpnw9>
zgrSN^Cx9==ys^x4*8F_QN^<XA+54We*Z#hH_R&_y#vufpy-1@Zq`n>e^@R<f2JrIo
zf%Sj@><VKUji6|04X`H;K#@j?SQ~?)!u*fm8*1WK+Mmln0KhyP005q$tR6VS{;;uf
z{ToYRDDyXV<F1LpqzZ*EM~j?tXtkgV0);epzwO*A##22wi`}r!pd3e^r<hcOBs1jr
z3NJOG=}U@cpHy{d$OaU@L?T;CRx1$bJoKK^x&SFx6ywZIC~k}`-AAM54bMEQy@gN@
zWr;q8s+D(zYY&%Gc766X(ha8T>tiCN3Z`jO7sQ#enpcfwm%rj0-EiHKcL{c!F9J-9
z?cG=lWg{`Fpi~H}UQek$CUg4A^s=L-gD#?M7-&i6k?C$T(<reFwful~pJ#>M_BG{+
zznCM2SIaiF{q&wuv&ULg{BWlnT^Y8cxQHZ~ou4Y>_|gc+6iQueCrpe1uBw!QTEl~d
z<rY%PR;xYE8rRZ^>fRRO?o)=8Og!PRg*vq7UuN_is3_Fmcw}+Qg*YV>a$&`q1i5@e
zDaRH$Zj`6F(hxcqHG*Hj*)In`2YK*N9>mb_**#eGgdPY9br3)&?U@gK96sdv(jGy^
z4!a<)K<QB<XdjW!*C_#~QeTE1Hf>6UZYQj5N_WpXWZpn#(ygt!7iRpCm962xcqLmi
zBPLVf8ij}R%Pe;f!Kh4=(TJ~CNFE$Sbr7GPFr-U-R;6V-KE>`VTD|2g8vIVr*eba{
z*nb$%Cc|aS8%V5Iq_g_T50*Qk+W<bfPLpajbXk5XfSRPIU&pggVDAdy<?2$rBIkYx
zmY~9f?jPY0m&nFlr_YU_9ZwQnXPwz4cqnsGT5?37fdi7IC(#dvqv10f)2V}jnHO5>
zKCh+9;+Tzk8I3EjU$&a{>}A7_AwgSXEe*R2aFy^?4HM`IbdX1cR?y8H`J;TAR2W!U
zQS?bQ31C?rYX}}L2TjB6j$~_^IV`FHk@|ihs+~#7Z?^-@#edy(;b=@+!o&Qg^=BAS
z|1%-OW`m?9h+QM|TKp@4eF9wgW*ZO=BTjOii_`Yky4<r~zM^E&mumWDo`P7Egz^br
zYeO>sCWI5BIV!u#C#zWch0ubZhJj=S7BZHJofCn!3^X9bf)NBhQ+;IF#N-k$TnrHh
z$AR8f1p=m^jIHg72J{Y!qwGfDHweq7@yb-Qu@@E2+xRId`?BMt5eXAS^abUp*s5)5
ziUDyNN#^8HA=x{6^3={?KK1)47aRr4*RSTa?pY#%X`@~-N=%I5)g&uQfsNKt7DRIH
zz^o8KPQR#GyCe{6TZWD5;-Y<#nSHY$f=0_-KfLPjg-`A@NnHpODn8ByGMlqW6^-J~
zb8w8`B_0WBy5Y2-RZw6^>>dCSoTR1-G7#1fexlU<GGavp(TV5IW!G3pI2)`cDR26g
z*r2*8xiBeu)iWu5B8<qQCqhhv%q=BGXFZW-<z7f5)K?ODu+gPDKq*lG-NW0AWzW00
zjMStuk00!uNAVJ(jjJ+k?rqh7<?ua5&uw>QH^Ejm?^JK(FC=G)nLU0?X$DVbyK4c{
z)kBPn>|Gu4n+D8Ed^o8=cO>PjAq2#&3O-3QgVsvLuch3zuM*&XryCw&t&+xLAN^Kk
zyu^W^@cvC&`O&7<&6J1u*<GAks-z6KsOmUd$*N+TcB8fN*zuFn^uAH)3cqWU3L4?;
z;z5z4_T<x=Rs8n?2u)OR^??~0U>u_iNqeDAx0v-p<!Uau1wO%tBz#23&U>Q|2UR~H
z_Q=bxdQ(@YhpBF88YtqjR_aWyLveU^UhnY56D;-`*v7*bV@Ie;HoI6pA{7n9VnVh0
z%kRa=Bx-R6#h#=OB^!K2GG*-?iFPEAem!0*@q>#WypgsNRL{t_JY-eQ5$0BKU5Xmr
zxXr#dP>LUC<IPlNXryK)$e%D#pNaZ1r+w1NJQPe_y^X_406%c?d4wh1nTR;uStDpb
z1xnh{9*Hru$x|=JFvCUavjW$Q6`hvT^z`K!in!#dpk2eat>Z{29rzMx{rj(l;u1&&
zhf+qa`v@LcksFPfJe>il+=Ujd;P`j3xmCM$LgQLkw<EEv6*tvZnOr-r7yw6#af<F+
zFe}5C>`;u7{K|WDE(eS+fDT)tI>czPL0Ta1j6~>=!UvE(ldkf$O6@3~NSk<q%mUk5
zx~}BGdof=cylf21!x_!|GXp_dc%*JIw|tVmbl`nXeDDrSyJXkh|4;Z)%F$cR1F#jr
z!;U$rT$TJeN^QEf@k$ShHpy<7=<#Ot!iEl2ZHhU72uj#<3%8Q;&S+iBlc&+2+^OE}
z;TjP0UP;qvy)Jh@-TyvI83-;Cv|AJ)kr*96ls}>+E_r;3;o8?1FJBjBwuqj3*1XSi
zlx#K|T0vMgt1xKRi8|wPlTA5vpXLS$?>=Ym-p`E{c0y#wne${%$_=Htl}9gqx(S$_
z$MJQcJ0=abUF7k_fBOEWxd~_XjPxx7)M`C_Uz4)4hYtc8GjsKdpKD>uB5l3!&M7Lx
zZ<59FdaE=CdWN}CaWs{%b?Fs0Oa7|^h9U$B@FnZY{K%0^fpQR*><5Ek9Pk@!RXamg
zGNDI*x&;)01264&Ct35>sL7P#ycw^f>aSx0+b3FFj+?raoe#z`X1B9nE&vB6DSzAp
z1L@&t_$Sbb5n<Tv9;lq@C<FU2ec5#a8MQks38s;>GTz&DRaaw@H6N)n@`iZL5n_j&
zeknDW*hlNN-FC0H0y|Qb$z9YfPICa7sDLXAU0Do@anxw#fbv`r6bV^~HB*b=6BZZN
zH?FhA1N0P{iY48REN|QQ_nAq0m0#Q36~^&$j`ed}dYtNYxvb}s?wikG#WzA4vyY-j
zLO;F|;Uw!_&tZ9_5>WE0FCMD$D(P`pzfown5UT`Vct}OW@z`(}Rd=5Mp<S*W7Xv3n
zu_4-7F50w|hJa4*^{f{iqw{r<xB_h9c}hC8P9sn%j;?%(Uz{MGnGS)ZFF^IpuO&ph
z$<s2*2In8KEGl^^UYxYmfW}en;bt)QX}lX20_*Da8U`8XS6r%;<wf*!+33XUfh+A3
zN=-gSKwn&JQ`)+*KlJAWS4P0Nu;N8(+4r=4-HghHskZWCig$+<URA&LCt?d7)20Tt
zUofBBF^;si>e}w3Vo|Ed$wj5*gay8kMMMji!IB)Y?_l>L@zhlgMM&s5W}d*T)E#?j
z{b~Ha+}Cafts0mBAn1zVJI&E2Z5UU_o?VT;7@&SAVoc-0J%hJ6`Bc=tZvJNH<kt;f
z?}U&K`8myX1r~L?Yg0QM15&IFH>FfzBg5%J*FjA?92$LW&S=LG46!l$1Q_O^x+GVM
zgRu+zzIvO(nogoVaF4uqdP~)q{VB#KA!ZoIcqurVCt?QUkOs>`=B}A8_Edz2vWIx@
z*UrZ+qF=lSX5~U&rA?DM)T%sDwr0N}!m9hFwS6SgLR}#asLz2-IT+mNwd?ou8nHn(
zSbFCI0N{;TClZ{k5&vz8*rcxxo8%{!Dr(6k@a`|WI6Vf@zEsoeO<yOEba{%ZDO5@#
zmK>q(I7RO~4=QvLtl9MuP}Dg-h<jpp>jWIW0J7^yY-G%~DO#|4tVeB%=-Y~&O!vs{
z9z7-)H=e#w>%y<M{oZ@w*e;m8nAu#s?w0h|&!_WjN;-3*&q}U77U_AG*ofGI1V%CO
z>BmG`>R|6iLWQ?`!gvC619Z}CWN<4%)-}&lXE=x>>_8HEYVzGO`qrRmM}`;=h_G#c
zb$>B{m9v1-vYq`cSs<Hb;OjBg_ml&s6KZ|rykemIa9@=Oa<dM3DG=aJRN&MzQ3bKj
zjiaKMl(e*@7aX(a=_zjLjx$HHqd?<oA*~WJ<?h2bpI5I+<ZqAJ;vlud$>2fVM|W$f
zX_=d1O)9W?X-{cTl@aj|O0c&-?l+CxyF*E+p0jMbv&}RBx2=|jD^tKa=jfFaJ~$=T
z487Txk@k)P^*`YeH}S7MO%;IS<HeWZnAT>_kejOpuQahytUH)Q2RM2LHf@p4KYnHt
zDf;oHWm!o}AD{6xNiq#v3lesxb|pmhs@q|goh=h&$5pA>#*UXOj=~jrXB=PYPomJJ
zmOw|UfvNp1<06(+4lll=9f$k@GKi3b#Y|V-YsIXY4<GG0VGk>eUsJw6U0*+zJi$G)
z%Xtt<jQlx>5T4n^#m3du-qF_OJdgAm$!MHql7Hrrg$N0$;>vQ*a!fke!1(RTPhgm{
zEw7E0gZ%>+8(u4GS6(Zavkk_HHc*#uQN<e*Qv`pAD&>P!gzfxPN^{di1TTv2%a{;l
zGAhV&wso;<_^MxN0@kZ;ZGm^lB`zO`tud5|*;D*+tpo`MzkC<gad=hF2z-rpa~_9|
zj+7r|5ijWJ9Dvj+c<1z#{7D3A4wyh_mB1*xa-nW$(8L}~a*7%M6$PJ4q!g)c;y}d|
zH(0c53&F?J$Z!|SW8Ym|SmC+m4EPcoikEZfy{)U+!=|W1^csaN5AYK<yE|O-U=sGd
z-jXo_)-LRGoN2I*(SYkeYQPJH!M^D*h>^D(^Z8$Sf6?KoK2fGbSfFNLq<Y%%^|(Eb
zDUPllgV)N-KC=rBo6qOVRG(#Xl^9dI8AU8Ca_E^+F{HeHL?^)SjnN^A$kRP5O{<`*
zst8C`-Fgb76tv3A5W?u7?pQP8xjM~^uXd&bFGzP0E$^#c^4_-SUb<0~qci!`t<_z<
z%dHZ=25tn*FS8n#Z{(~rnTH;42***5;h1Q}-A!ga-DCK!!>?Z8{;xVXKpY@{8zS%b
zLj3<X#Cb)PVv6FgRR8S<2P1@wv(<Smon`a?yOz#iY@M-ky%<mp#z$v;`wV91!E5zR
zo-^o=(Y`!ZT^(DNEO=<eT!(?LH}~DcTscE*?=6Is7KJT-Jw%{sXNODncoPcG@zj`J
zy%zDQM6JD-N%4g#>{hdo^1gseuuYxjPCB_`BS+G~3b1y^WU**aYW`s_;eJpq?M*GQ
z?OyJEk)0*6eHH>oMR}r_XQWk8;j!`egJ$+~5v&rk%W{sAF$uLi)t`3w2#>}1=j|rS
z#5J=XO>&#rzp+(MaMGb_G5gT4<r+|;Q2A1+y~R^ZLKkMlrtd*xKsw-dw=xYX3)>;l
zR=<EngZ;aG5zt>+k^wdp&kn!slHi{2l7Kw{fOGWk_D9aq7&!s?0U~GU@4F@c!twL-
z^G6P2%rL({P5(jhyPo>vB*KX?6hCxW49QuC{dF$C*3%WhkK^e6iR9lpEr$NA)BZ~T
z&$jg={VUAL_c8vS{=A7{ZgJMce!a!7GvNMd1|uZ@@fPR(;UClZU9tTr^&~0auhPT7
n&uiyr!~C=8epG>i>>Pexf<IB<;+=UBh<PKh0Dz0+XJ`KdDE(L_

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_335476.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_335476.java
new file mode 100644
index 00000000000..484a32d877f
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/regressions/Bug_335476.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Broadcom 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * 		Broadcom Corporation - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.managedbuilder.core.regressions;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.managedbuilder.testplugin.AbstractBuilderTest;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.Path;
+
+/**
+ * This tests that an environment variable, which is part of the build
+ * (in this case referenced by a -I), makes it through to makefile
+ * correctly when it changes.
+ */
+public class Bug_335476 extends AbstractBuilderTest {
+
+	IProject app;
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		setWorkspace("regressions");
+		app = loadProject("bug_335476");
+		// Ensure Debug is the active configuration
+		setActiveConfigurationByName(app, "Debug");
+	}
+
+	/**
+	 * Build the project a few times, changing the value of the environment variable each time
+	 * @param build_kind
+	 * @throws Exception
+	 */
+	public void runTest(int build_kind) throws Exception {
+		// Environment containingg the "Lala" environment variable
+		final IFile lala = app.getFile(new Path(".settings/org.eclipse.cdt.core.prefs.lala"));
+		// Environment containing the "Foo" environment variable
+		final IFile foo = app.getFile(new Path(".settings/org.eclipse.cdt.core.prefs.foo"));
+
+		final IFile env = app.getFile(new Path(".settings/org.eclipse.cdt.core.prefs"));
+
+		IFile current = foo;
+		for (int i = 0; i < 5; i++) {
+			// Update the environment to reflect the new value.
+			env.setContents(current.getContents(), IResource.NONE, null);
+
+			// Ask for a full build
+			app.build(build_kind, null);
+
+			// Check the makefile for the correct environment
+			IFile makefile = app.getFile("Debug/src/subdir.mk");
+			BufferedReader reader = new BufferedReader(new InputStreamReader(makefile.getContents()));
+			try {
+				Pattern p = Pattern.compile(".*?-I.*?\"(.*?)\".*");
+				while (reader.ready()) {
+					String line = reader.readLine();
+					if (!line.contains("gcc"))
+						continue;
+					Matcher m = p.matcher(line);
+					assertTrue(m.matches());
+					String variable = m.group(1);
+					if (current == foo)
+						assertTrue("foo exepected, but was: " + variable ,variable.equals("foo"));
+					else
+						assertTrue("foo exepected, but was: " + variable, variable.equals("lala"));
+				}
+			} finally {
+				reader.close();
+			}
+
+			// Change environment
+			if (current == lala)
+				current = foo;
+			else
+				current = lala;
+		}
+	}
+
+	public void testChangingEnvironmentBuildSystem_FULL_BUILD() throws Exception {
+		runTest(IncrementalProjectBuilder.FULL_BUILD);
+	}
+
+	public void testChangingEnvironmentBuildSystem_INC_BUILD() throws Exception {
+		runTest(IncrementalProjectBuilder.INCREMENTAL_BUILD);
+	}
+
+}