From 9788d24ca4d9f8d21b34daa4621ad8c7d9135c0a Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Mon, 23 May 2005 20:31:18 +0000
Subject: [PATCH] Add 2 new tests to the suite Update makefile .zip files for
 change to makefile generation

---
 .../plugin.xml                                |  98 ++++++++++++++++++
 .../resources/oldTypeProjects/1.2/test12.zip  | Bin 3815 -> 3815 bytes
 .../resources/oldTypeProjects/2.0/test20.zip  | Bin 4208 -> 4208 bytes
 .../multiResConfig/testResCfg.zip             | Bin 7101 -> 7102 bytes
 .../copyandDeploy/copyandDeploy.zip           | Bin 4196 -> 4194 bytes
 .../test30Projects/deleteFile/deleteFile.zip  | Bin 0 -> 3868 bytes
 .../multiResConfig/multiResConfig.zip         | Bin 7069 -> 7069 bytes
 .../test30Projects/test30_1/test30_1.zip      | Bin 4371 -> 4371 bytes
 .../test30Projects/test30_2/test30_2.zip      | Bin 0 -> 3399 bytes
 .../tests/ManagedProject30MakefileTests.java  |  44 +++++++-
 10 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/deleteFile.zip
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/test30_2.zip

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 89e61e76651..ee6052d7757 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -3274,6 +3274,104 @@
          </configuration>
       </projectType>           
       
+	  <!-- Test tools and project types for testing multiple input types,
+	       multiple output types, and input & output options
+	       tar -cf  &  tar -tf -->
+      
+      <projectType      
+            isAbstract="false"     
+            isTest="false"
+            name="test30_2"
+            id="test30_2.tar">
+         <configuration
+               name="X"
+               id="test30_2.tar.config"
+               artifactExtension="log"
+               cleanCommand="rm -rf"
+			   errorParsers="">
+               <toolChain
+                      name="ToolChain for test30_2"
+                      targetTool="test30_2.tar.list"
+                      id="test30_2.tar.toolchain">
+				  <builder
+		              id="test30_2.tar.builder"
+		              name="Builder for test30_2"
+		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">
+		     	  </builder>               
+			      <tool
+			      		name="tar-create"
+			      		command="tar"
+			      		commandLinePattern="${COMMAND} ${FLAGS} ${INPUTS}"
+			      		id="test30_2.tar-create">
+					 <optionCategory
+						  name="Options"
+						  id="test30_2.tar-create.category">
+					 </optionCategory>
+					 <option
+						  defaultValue="-cf"
+						  name="All Flags"
+						  category="test30_2.tar-create.category"
+						  id="test30_2.tar-create.other"
+						  valueType="string">
+					 </option>
+					 <option
+					 	  defaultValue="new.tar"
+					 	  name="Tar Filename"
+						  category="test30_2.tar-create.category"
+						  id="test30_2.tar-create.filename"
+						  valueType="string">
+					 </option>
+			         <inputType
+			            id="test30_2.tar-create.input1"
+			            name="All cpp files"
+			            multipleOfType="true"
+			            sourceContentType="org.eclipse.cdt.core.cxxSource">
+			         </inputType>
+			         <inputType
+			            id="test30_2.tar-create.input2"
+			            name="All asm files"
+			            multipleOfType="true"
+			            sourceContentType="org.eclipse.cdt.core.asmSource">
+			         </inputType>
+			         <outputType
+			            id="test30_2.tar-create.outputtar"
+			            name="Tar file"
+			            outputs="tar"
+			            buildVariable="TAROUT"
+						option="test30_2.tar-create.filename">
+			         </outputType>
+			      </tool>   
+			      <tool
+			      		name="tar-list"
+			      		command="tar"
+			      		commandLinePattern="${COMMAND} ${FLAGS} ${INPUTS} &gt; ${OUTPUT}"
+			      		id="test30_2.tar-list">
+					 <optionCategory
+						  name="Options"
+						  id="test30_2.tar-list.category">
+					 </optionCategory>
+					 <option
+						  defaultValue="-tf"
+						  name="All Flags"
+						  category="test30_2.tar-list.category"
+						  id="test30_2.tar-list.other"
+						  valueType="string">
+					 </option>
+			         <inputType
+			            id="test30_2.tar-list.input1"
+			            buildVariable="TAROUT"
+			            sources="tar">
+			         </inputType>
+			         <outputType
+			            id="test30_2.tar-list.outputlog"
+			            name="Log file"
+			            outputs="log">
+			         </outputType>
+			      </tool>   
+			  </toolChain>
+         </configuration>
+      </projectType>           
+      
    </extension>
 
 </plugin>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip
index f32865478ffac2dc86557cd25c4188b9f700716e..facb60f7b9b8826de797cd27511f915094b629e6 100644
GIT binary patch
delta 446
zcmV;v0YU!f9p@dO1q1DZw6g;Rs00YPg0wPnh^G*fvk4)8QeA7?Fcf{R!T;fmB+Wu5
zcd)mxl&o%7HYf@0U@wEANU|+vOGY2v!q|V`m4gZ0!^WTjfpqS<_a2?A$>e!go=xyB
z2HWwV1#jB}tCdlX2PIMIRu#CmFg8F*9bORonOB|-3Z#TKeGDGlNZ1&LbLDJ@&?v7E
ztZj+%Xaxy>wZ;>WBG^aWN<4C>`My;ic~<UrUmxzv2Q1h4l1*RUZ?~To7eV<@h`vW^
zxV`!~hJSJ?d#5V>1I5KFLI$Fx!>`1=zS;eqDMw~{#tjz@eB4XzlnB-x&_y2z>HGEo
z7n8usx}#`qYIqx+AW#PgYl74JNLBM}R@fCr>9eGNJI~HGN;DSpt1&r^hgfgtr`QKF
z=o`gWxGhVR%Oy(N^~7^0QcWn^z5)A8;|3F8Rj0h?wPLL@b!gVF!R&NHl~c}t&~biF
zZk!EWm?8a}6+L7<E98PMWD2I61umZkjyXe@yF1#qU^}qy|LmFiT|TXK^5MNU+Bfut
oN2mV>@Cozd$bJKpSPSX{?SizkMGRH~2)Tl^GIEHg5R;=0L>WQXW&i*H

delta 446
zcmV;v0YU!f9p@dO1p~~arn3VDs00Y7ZKN_0N>?3|vk4)8l3#1vFcig~Yw&kCBT2K6
z$sO!1EG4Vkl?_TlJJ`!$D3WZ8*^<$pZei@Z@5;f1?qOq4fkC?Wckj76@?`S7E6*l)
z7lZA1(1N$^fz`?=$AglnbgK$nTNoRlqz*5Le&&^D!vs=7n?42)ZX|3B!@hF1Luiy&
z2-dcQJX%42gIeP$kTTdu-AX)ir}@5B9(lIC`uKq58eg*MPcCKeRHc8QxOhd8pnNDS
zZGI))>zm!*NjZ|`Zuj-!z8vY7_uK8K#l^sgzDGjRHEy_Q;NxCur$n&sfG+w#k-l#a
za4`*7S$7;-n;PCmCn%@`gf+qGeWa#&HY@B3qs%OSY2?}2Mv2B^el-@S=OOCt{FM7Z
z27RO43b$p6a=AolyPi0Af@+Gg?HjPq^xR+qtm>5ayjHALrVh>eHJF`lsB^0M4;<&`
z<j&ck!VJy7S<yw-vqCQDK&D{2S>W<%;#f1N+}+W43$_FM{!h)Mclor}$%psaXy4E;
oJUaachfkOvpX@i2SPSX{%%rBXMGRH~2&ZkNG7(Bw9h0LDL{yOF*8l(j

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip
index e4857604d67742b4fc6ee844cefa6a2af8236164..b4fc1936c2d39960140f2cee7238693fa8258322 100644
GIT binary patch
delta 463
zcmV;=0WkjXAn+it2nYi%gS4{?2$KT{3xl*WYGlOKlcozMe-wqEYw&+KBT2K6$!+%-
zmXg)&$_gc+E$n456ic?nY+WPC*}~X=-?f7Y-OFAwfz8#uN7CnW<<aQ0BaTM+*aoU)
zFqy2Xy(qNRP6n-zn@T6RC0Gj3%7izpKJkd7o<J!W+qA($S_NuDALov0gi?ErKvc10
zM;U{X^_=J`f7rIBQrJmn<hIftag=U0-=3e+XUv!Q8jasRt=BKJix=&~RgyIgx)awo
z4@3QzRH|`0H$RbFyyMJ4NgVy|q_=mQe@N9J?Y`trW+i;PRmSNoklUkfec(*fRC~C#
zW6a4NxQ#8~sdX7AO+ZFAIJ0eo_Hi^xXn}!#(vio}f7wcBC1H9qEbcnQst?m+?K6Ay
zoofr+rzz6;94XZe>)cUPa8|6}LljpKjaJff^N*3x&XMyFU-&}syPra^BCoagve2T^
zwg~0&5@H8I;}tV>yZ@JsaemGYpY`OzvL~wro3orGYQ_^b8spUr*RKnQH9gPcBR}^L
z8;Bn#7o_XRu3w*e?7}BwjW78h8v6WKmoPnCvtSLx0Rt|Bw38<f{Rj(#v@&XB#MP55
F5JX>n=SBbk

delta 463
zcmV;=0WkjXAn+it2nYidrKYnB2$KT{sBNS&qBnFdlcozMe-Ou?Yw&mYk0i}PCb!*V
zSV~s6D=U<Qwy>AMP%PONvvo$2vxTwmzO#b~-OFAwfyL?WC*5Cn@@RD05l16@Yy;IY
zm`qmHUKHADCxceVO{Eju5-bI1Wx^Y#PdwtNSD+M(ZQ9@=tpc^7w{u4|LaDt*AgUPI
zQN}{adUkXXe{5S*DeR;(a$9MSI9lI4JY&AZ*J%7pD%Ciho1aK7-m&LJ`*4*ITfe)+
zw|AR=plU$V&F0(lQ##;ppVsS_*~J0Mng$)y-Q-SYC49S8#_24O+oNuMU{BLjd$_jK
zn3Fr`HnxDL)@AH80U6og%(e~M$I&FA1%^D6E=L@lf30*@5~er9=B`6beV86&pSecg
zIkv!knj)Rgky70-=Z;XpUa@`;QCvYZT1m^zKUzXNN6tfh;RnHUzl2~SueJBG(4x||
z2<7q;Vh2Iv6>I2D|1SsQ{G3aE)+-m5YqDB!ah8)r&3M6u#&|Wu_3OZ4Pp{|kk-vM0
z4aAQV7pm)&UBAwH?7}BwjW78h8v6WKmoPm%vtSLx0Rt4JrjsWR{RpUSq%xv6bS{%D
F5Jdd`<jVj6

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip
index d60c3f775ceb3ef8f67dc3b1e8654350d541763b..bc45303eafcf1be1be69b213c2e303065b7ffbb0 100644
GIT binary patch
delta 1815
zcmd^=`8O157{`q<G}d8ajIm|paJy#WWDlh-gG3~<a}u&1%T>Ze+(dK9i)$&%SVK&f
zC|Yz4XQ(ihVk9@&GBv}<(irZHyZ8_8FZVs?ea>^v^M2p+p7VX5&-2LWu@S`%1`SAQ
z0}e3U9+i|feFmpO43xrEKsoFP@#v_@++<7>vuEm(Td5QqC(2kZw`=<L>l-?u|LWel
zyaE_b_l8uCRXVCSc{V@jvY6G8BAlp9gh-eqH)$p;YnXtSZG3b5LC1b{d*7?0Ruqz*
z#6(Q(`WgG|!=B-WzN`qh_(B|eKjv|_ceAC#`AKWHfz~m*7}ii`%VLfPu^Df%+N<W3
z@sehjWV3W_D>LVVoIRt=Hs(_Mh9_y>K<AS@9<$ylKS0xW?>L4@DhExk%sLC1Zlfw1
zIxf>r!^dEGqawBU^$2A_NtLJk=PoKm<+aR=(VPoN)O9kx00-Vh_S-Ov`!+}vll(}t
zXWpku3Ri5L&2OiAqo~Bjn_h&up3&x>&qjV_3!#t$J@sc2hC*p=hvI@2(inf_dQ@v{
zSN1RHykMPUT}9hHyyfzVT8BU;ROkhC-kRFfiyCG!CMSkDkTB>fo28YT!s(}GS6*(u
zu`I>I@&e7#x_#F?w_#59P!Vw<!8*^kU?&j-;09Ba(Z}yrgZW0Ki5bZXj9O59Yg7ag
z5*mgI3GD~|VhZ3k3J%yPIPos<4P_kMODzj!#~WiqT61V;86Cp~jkboS+IloUd^*`Z
zQ+JkNO&m`jVNEuOARp?@Tf_QVzVa3(E^Ee{Mw-#9t~&OVNUhaR#XSnFeoc?Y!$#{1
z&^4mt7YP-cW&_F7H?_LN)2`4R*wS7Sg;VjIb_2}1ohdx>go6%Irl#DA^m7{m>kf03
zI2_fmUSA*`qEF*+X98M!r{v;o*LVRI+oNix$gq7w<7*31&M|W@Pqvan5Lt!3#PFNG
zUKxD@?cc969of+8HcG{YOI2;_=7*3G`ba7o|3fE5ZeZXUri-d&?0CSzCDQ*`SVTDU
zv46Eavm@3?HJvyzS?|iGSJQmW46xmOq(df3gJk`A?+)iB4MgIIS#QL=cCu60@sB0H
zd^9`|m$A9;j<V#_nyj(tq9H9mqqByMnkc#{Wy6NDtjsifZ$c4%9@}4q7~6gt6>a6C
z`sH*{jbVS~^m8xOAhM&{Ih}{o7EL~)tItn<SuH5V`<dY0O*gbxetk1&F0++*#^XU|
zGI_N-nIrRv*JBA4c)6Ev?H(b4hrA~jzVMsP`~Ti(!T(jG0e^|L9n8733+Dqr$$La*
zbQf<minwuQL)^D@iNSp_I~X<+9WFi+N02f?bwD?>?8i)8KbL7Mu(at&UGGvP=W_x#
zzDBt)<VGm&!g?nd*O6^xRFW*5suqjQy-o<*FG`c!?@Wcqrly)6aYx>oq?RX^I*51m
zswd^f&W+JLu8#*K=xNq|LoEKjLd<xdbMyn;)A_-D?1X&&b)9WO{cH@SgzWx0(|+dg
zyIFJhIMG!CR}ASF*w8(fA3)M~t#eCbEENmT1F~PaEH75Q?U8io^r6=^*zOBjQD+?V
z8H(DHGyb#^&iXpfmAnt*F0nLnuW){&W{)P(t+~Zp-~CO9?pX`|gHNO(yL9nRX=_!H
zChpmp2W1KtyYpa1!3xSJ6DU)_fS*uUsDMMEC>!{{90FY^JN18lbP1nI&3q~;{|z#T
zkUBpj!9g8d6>Oj+fuo`-BmhJxYN`n&0xNR(k`%r~&>DjEm&6g=Q^czApS6obeobQM
zgdiaJTNZE>jUlGsN3=O)30&aEL{Nt|fRMo?+7iM8s!9eBEI6%X2}uTdN*2O*5dbHP
e0W2k52ok7ZY#{X@5Muxt1|=9}(O`MOwSNN4v{7mR

delta 1819
zcmeHI`B&0e6!)7j2%1Q_prqtlW@uVy<$_s`rrEfKj$3M>W#rm8d0fz_G}CG7g=yxN
z6t009Zb@oZQ!!{RgF~d)s^*fG=}AooY|hN-ADEx!p7ZXz=iPVT5BKvvpL^GeXT@=W
z%j=~vfg9XZq2f5xB1kAc3W|{0pcrmXvls3d9*ld>K+uN+6D-^AV5xlirY4~^*;QW~
z?OE*Ur`~vbi={nEEl6b{&!=!gTLGdpV{IBS9P{xmMjgRHpSOoYUi)S+=Ww6a4;sjJ
z%T0vnu7a2T1lteP<mqYUUijU^9r%EZ&c`mvPUasin>`B!L73W}=L>cBdZuaNvC#?K
z&;HpX#7e>2v4M$-eqKu;o8-2%F{O@wYquUtk9|_q_FJ|4{+#w^?PnwM11Aaw+aDZm
zt(|ngWI<G}vGKM)>J}Y=qt7G=hp}q$zp&0Z8HX1ZY^I2Ov&`m$kLKP_v9=5C@9T^@
zEig_JV<t17-Di?6y&F{>Z{A1?%YN;!6J4LOn%oL4>|?{LV3mHOwrs=Rp1zVFRU*?}
zT^OepFX*sXeImd^hn4lbx#kj-g)%QeN9dpBBRlc(2!Y*%VD$t#7{^JcSzT1RMp90p
z4kS`8M~&b|(?2n}Sp3Z;MR!+u7)nlNQYb7|0+|Coa4g!w?3*k&jj+PVfa3Vl4&_2}
za!=*u<P1RwLLC%pAi)>{1*+gmG^W78DEzp@!N1l>G*W!ufX-9R3^lIL)z?hEtysFu
z^FbP&IP^3dl|?B?oNSs4XzEQ6GmNy8P=nM)A2@rAU~(fTC()Qg=Kj8g`1Ij!)EkM%
z4351`bYMN~a^$I>hy2=LtzveysLiKm@5w_EsDv$WwTRoL^o(FNZ^9I<t@>r9-%jS^
z#rd%{bl2yG0|x^#9zNmDpQDcK<D9WMCSi4;RV~V!;=);ZC11R%C_DMf1q8oYgRb{i
z&hO2C@g>x5S-1?uA2M(5Vmc~@wUiCrbJ=L37&We*KV(y|&5d_vbxjkuX5lQuw5IEA
zu??z}cc60UhAU{T$ioEDygaV1%cgi}&fM}ZKZ(gm>b4HH+Lnnwo$Z{|s}fn~nf{0b
zW6+^LPni3geiXsRjreC7uO0jlmdgs{LV7aG8bMCYo6J?!n<E|BzC*Y5LVU$Oul!ft
zF=3_`wsy17wW<R#cptMg+i+HVqHC81XWjVpAJ07I-cdT~q$0+8@~!JdWd;3FOC=5X
z#jP>~Ri%I`$jOj%#zhB6DHixYz5YXbeQiH1{JMq55iz@23Pv9Y#3DedqG(0;Bt^!7
zAVjH#MvaSENd1gDST}8EN*VSpr(O4LDRt&^jW-7tdPyqBCM0>W!9kG?5}ipi#H@Hh
z@Rm>Qj@#3(>(PVl59phU*}(PE^KEd#B^NvQ6B8SAVL3wWJ;%J-#Un8IPpKTE?Y#55
zKHKE0#-A$@7<_tE2e@mv4`xE0_mAlc(?@BTJG%6{YwMY@$DJBYHm&tqy67z!4z_Zv
zDO0=hB!MGH<h)ZFzc`CFYI{OX=rVbrMX7LSD>S?!a$OvkHsD#T*OI+#y5`kr9@E1I
zICPHest;)?e6eU4{b*D?IM6+(NmZPEC2=%>hRx37s~4Erv&1i-I%1bN>b)H~G-dg3
z<fcwXnWnHZAd1!P{v8m?Saq<dzWMJ24t%enzY<e5oRI&B6KK(JSt(ih@Y0f1Sx8Wh
z)B*DvO28ef1BHMntN~tjU)KF!rDB#Q6*C!9GK1vSOZ|ROi`B<}Ba6~gMd|u#D$-2_
z%wV@eI{-n`7McRbq&^XpYZ9RnAkid2ivX`hg!I4xEfSOr7+Q9#s#Jg(1_!3J2+$g!
XgL8t)K^Tq*b%ATRb>D@n$sYa-ol-Q#

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/copyandDeploy.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/copyandDeploy/copyandDeploy.zip
index 2a2d6585b20077a48bcdf077eabb0428c93ed551..704a56453c87ec6bfc6b8f0ce91694b91ea1bb40 100644
GIT binary patch
delta 937
zcmV;a16KUxAmSjf+XMq3f3%a{1TYCrceFAmO^Fh;lNSXmlh+Ckf6ZD)zlEh_N!zhO
zNNEP!hrv)J*%q^PMnBqwvHyK12a{y`l0XH9^S$@(o$l1@z3fSo9()WQYwoq+Rkh6u
zWt8P!Nyv4j7~CQl^q{2nuZaD^Cr#Q8qy%l6;2m%y0fTSj++q#BR8E0Mtcdc2f*M8R
zC=n4@2VF^c;#Tu@f2ACx$@ibD$N380OyEb-fBm>zejUBL4@R`IHhRxC5Pg@kFCFhU
zm$I=c*Bf95?6-vN6iCsZD7w9SI9Vh+(fnkI=p=D0cU+X<!dhypgh#uDIyg_6rm41I
zL%eW~b~glV3UC;#prrO7(0HrY!7G<0d#3>tWB7k81GY(%e~YOSCBkslm5UF6*dK;_
z>@%(47hz+VW3z47vPVTjWav+0;xOJx@3qmcq<7V|`%h^Y##<lugyW+rQSawAxtOi4
zub9BPA(mx@2~6yXg%FS}uOKU~A^S$JA2LehwQ`OZDyx(!d^sT;`%`j=x-%tkc}WYs
zXx%bHgP)G+D_WBQlOy_}z0!n6aB~doG_BKOLEk6H9w2)@$v1l59M?N{18MRXP)h>@
zlba42vl9oJ0|`xcv@)i9&@QQywhC4S=X>w;?voJ<DSx^SlmcVh7(5880AuLl!eIlU
z(q2PAtcmh~k{U(pDUlG^MpG+z5YC8gtv%$~w;!AP<p$o&;CnWFeZO9RnOro&SiXZK
zwqAVh!CykD*6G6RfM2|&Oh-csekbP5?cMWC)iamR^JLFUR&Rx@z{jmJPRoF94^8xe
zGHqM$!GFbMqCj^rW^4%_qmz_00VLYs%r*w?^K8WB6ncXrzRR<-xt0~ec+r=p1rq1o
z_=tU?5&k4>3QKJF-B^#PY>5oRc}n~pA4)$MYkWoTqHpb=t6`iRjyO)qJau<!L#xH+
z>XJ)rT4Fg~+Q{XRSV{?OeF?0*0``?&DlkeEjZ^ksl$zDrmZ6#vj>9=Aq`DJJ;QX8x
zb=IjdOQW4n$;@oT)r5X%Uo?#gTt5X4HJ#FGMc+qYcfcP1OE+m=KfUkNY3JD=P)h>@
z3IG5A000?(w6ly1h5-X0f3%Yo4nPS_ceFAmO^Fh;lU@#C0rZo=4nP4llK~Gx0k)Gw
z4<rdqceFC5d(bYalW`9f0-_3&zX}$Uo(~KI8Gp2stq&UkeUr%#I02@U0uVj{0+T@y
L9R?~500000!6LEG

delta 950
zcmV;n14;biAmkvh+XMqpj;fR11TYEXjjA%B=Y1HplNSXme_d-EF%W#t!TpCVw&R-i
zl$5-gI=FU{(t>e_3++Rp$dc|(^iF%|Beg00?_HfaY_~5qL?DoMW_Cxr>h)fBrAZGy
z1dlcMTJWmcW`#1!a<3%hx>5}85Da=yQu|lLe&LlStph1Rn<jV%+(^LS+jDNQ245<t
zz#~>fc}77-f6+J!L<H7BR}!AN)qGtk2WhgLeO|$v34Blbzqyo+Rk_{(yLt#lw9>1$
zgvHxChIIN9E!^Edo-C4`=-ZFg)4Y?tep)WSj1B}l@&+PvesXfrC68^n=b{7`)>2y~
zJlZYP!Fh@_O|=CZ;)8RvyC!H;fWu$~1+@o(##_A(e_pvX*;g7cF^2!m4%jA5E~ZM9
z2*X*IE`9)FzaQ?gPc(v`gpFa2&9)uO9u*Cdp+Aj*!}Cu1ppAAV{j1LIKdE6DUw!Ba
z$46Zv@8_Ca%vLwoOkmv*%d)}*CicWa2*{S#kQFzOeWl+I83poMImZi?Rmv2;oDh!v
zDOHHNHZvt~c}WAkXscz08b2M=vnB&3M|7dNQin!xdkpL}ZKcJ6_D9GbA^UYw-B|PX
zIN!MwNRz*_^ai*C3FD2bGWb6<FRGKZ3RVU3y?6KClMo9je>w+Bfw6529)wkZF?9FB
zVFRJkUPC~viSmGwjH2}vNC<4BsTDj3XT-MF9`bCx_`HEPGx(kje+i{prwg+Ke({zf
zjWCuYU4AFso7=nRnW|@g`?0xS_T1O^>-Cq(MaS4df|t*ik$sue>aCC!__$TZX&KP%
zp@}|Fq;2axf4G>MD9{}mGqwbe(MbxL01|C*W*dX{c{bv53cZ;T-{slaT+0e!yy#QY
z0*Ui(e8fJ{2!9ebg(bH8ZmdUCwnT>EJO%!~A5uRUYkWoTqPO->X&9#tM;xcrJh?m7
z&}y-{y5tg@mROFLHgb6+mQn&+Uji$yfPJNx3XB3pRHMBYrDnCZWvFI^<8V$2DeuG-
zI6tRFopox=(rD*XYGyX#YC=D>FPg>#uAc&joK9)AqVFTHJ7AChrJFRbpVm8d+IjW|
zP)h>@3IG5A0032vs<Vm=h5-Xmj;fOr4nPUxjjA%B=Y1HplUxpA0`&%y5C;{L)D9{F
zHVKna2^W(W4=Mq-lR^(93FD2bGWb6<FRGJo4;2EV3X{GH7L%M03<Fh;s*|e^8v%cl
Y#}7CGsFDyq0R)pj5FG|A4FCWD0J|u)VE_OC

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/deleteFile.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/deleteFile/deleteFile.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5275e36992ad5920dab72f050765c76729d4fdc3
GIT binary patch
literal 3868
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

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/multiResConfig.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/multiResConfig/multiResConfig.zip
index 4b45304748acde0faaa3040a15f8b5f10de2029b..4828e01bab87f69a88c0991a60ba0ecdbd527807 100644
GIT binary patch
delta 1618
zcmbPhKG%H1Ob%wNhAorlaOeqomv1pzZr^ORkdc95D>DOw%w$Dwk;(5l9O@mfSw6p4
zyzWih`_%ARUq0xuMSotvx_*_d_LRUrcGZcmy;65<G%$1Ul#LVo-5NeiM#h6Pcb0_B
zj)@x#Wxnm)Z0fXfkJE;2N~fAdQ?5w)v+Fj+UYUA?xqQ}pt)~;!PM>}D`di)3qZMuX
zp8vo8t@@j3^3lv{p`QBbuIl=koy#0=*H`WRaYL}aKvQ~o(O=n{^1q~=>b!Mw>$lCC
zef#YFtd!-M&i9G}4;`O-#ji8ru3YJtM!#9hZXG^)tuF7b;UqKGK33b3h7D>Kd%GQf
zn!J?aHL^bXxuMxCde)q?Q#Ewky4OWi&pc9RZIf7TaxTBccVkq}dOf4W*KHAc+CDj}
z=d7qdTESB`J#}(W;mSGe(eVwU;R*9!&Sn%&s9d|}d27;CBUg>|mfQd4NNscd=idLh
zc-Etv2ic9Ml-n(Ru-Q?~{fpCKmwLNHUxOd4u-p>6_Qg+zZH(1_%7xc9zFvORpSfmz
z?>E)Ins=w#N*lBt-~FF8z?+$civa{28nze#smTjC<R+iu;$e0I#?(zNa}H2U8OSVR
zm@L7a!B+b0%p6Op$!*-qj9(_N;+C$Tpe~{!vUYhhTVw1Mw?o3fVD9-eL2dKbU#H8A
zZy!qFnLqj6>$6#3H`;%Zm>aPD?e8=T<2%1^&-S@uYN8Z&nP2y*_4G|;TG#I@{GR)x
z%_++0(m(gZ^YpL%KQ~Qx_r`>SuAFx7mXvw1lvJ-+#9tD0J&j+_?CjGQeZ1Mx2Mm|8
z%ho$A;Prc-6kzB3?}ldIgZw)lle;^GRGso~P0M0yJdt0m{$}F3N7{+X5q{gtug^TN
zYMI7#Q8TkhzlBE=7;^SS=A`q#Z?sLjxgjJ*>v`kab&aCs2kb6BU=%*^$*b}__tBnB
zt{TT%lFOZ@&dy2qWC;&{^6RLh<mQwUDJ3%>{xF*CUHePn^Fr&FhyQv%IAM7uUhn0?
zPuU6Q|1Vq?SoD9>sgt+abGPchWY2m3OZ@%9a+z84LE$X|3}y}nP`GXl@F_;l0pgQY
zd2L5?0Nrx{Bu1p0Rv8s5#!bG@_Zpn)`|i!!H~A8O6!W_`YbNUpXk;vR@XEM+?7_j_
zmfnTC#m|{>O#Q@l@YXC1|F8)G**2^~P0m-g9s%Y7`K+ggC-Ta7um64gwr!es%}KZQ
z^4o9wU#>j7^`z@<CDS|W?7w~R*GqjJvanuZ{{Dp??psQJPMuNyefNIj)bl>cllKdV
z)(b^Mlnbr(<;-6!EOLeM(5wev6xp7#-?Z4y{pHee&+iJmBQygeeXi9OMe%RE=XdS~
zv*efF4XkFb|9%bC%egFc`svcnm8WJ#ol8sLue4h)GW}HLhPR>-mAv0(#xc%d(3W~?
zt1r5Gs;2W+l{<Z5R}4gd&aa7yo0Kg+moF{j+|?#0wz$4x%cb&0{EM%On4fP9_PbuT
zdEtBJ8+>nm@9*|t%9|%{Fa0A<`mJ`=@4sFD3?wFBURTeIC{8RIwrrj%D8~ve@g2pb
zCtnm(28SxB)SvuE%!wIT;7oQDw*wb6P2%o|g65*QH<$y;9g|fgS`m@4QNoHDWbiwQ
G^-KV&x%Kn_

delta 1618
zcmbPhKG%H1Ob+JSrd5;YaOeq2H?1<t+9P7Ukdc95D>DOw%w$Dwk;(5l9O@meSw6p4
z{C;Zn-s!QKmk#fi$T{0AwrAD1H34pxa#LK^X-|E4?9dGc)zS*rH{x-bMFk3~TQZYA
zJa9X7tia;=xoaFtKXDzr)uq87HX$(ECUy%)Szx#j|DDWztEafnS|cvMUE=%))tCPt
z1ey6g{bjwWbNfZkQp-x`6Pq60i%*-@S8pH9ZoYl?{;MbaHs8tFm-l}9+;?C9R{hQV
z;{I{A?kqOlow}c<bqm?OTT<r5^7`9~#r!3gO|Hu6ZTnXIx=%GT_<_V}XLgS4rpvn}
zrua|RJFc)f*v8)`qj=fLn=zf2l6Jgk+Im>!+wF&(yBC+$Dd%)uO{y-P$Qf;Zq$n~m
zN&2Zvz3#E(4ZC$_PwDc0YIEZk)0!PjzkTxAd>Wo^{WMR!EA*7e!a0I@zl*(Yu>F*`
zJ$HWP{&aTvGXZ-)Yl_-Qrxdx!U-9|!Tsg*`wQrX5t*c$%*f;Rrc)Wjh25*c#Z(Y`d
z>f9~*Fa2M-eOq%-LN5J3cYrrD3l{?jGy!7-NKIbAAvgIH7Y}nQFs5#DnR9?*>VhN7
zqRA568EmG-&t&FGPHy8?X8bmJ6}NQ#6m=05k+sX4)tGj#=xtGdXL4WisiJS#W&UW1
zo`=Pk{+?U9X6~u4<|o?Z77M@HR(qf4e!!_S1@H6ojh6iFcRO9P@n89toQs>k{yJS|
zoUOg*-kLD^-}{rJ=d8%iNa$td*7N#MsJ=B=X~Au0(b@%*cbQceY}^^s_pTx_m)j!j
z^MZP2jx7gY#`2t6ep3Es0ZaX24PQMquPGdRGrh0!Fg4!)=C{#3>u7jaZ-V9Bd$H+E
zt7mPB3A=G4#B!-vGvkJzX&dL-?qUBnBlU1l;mSGe+jg;q-C_Lg(#-C|a9aDRt-gry
zDY1nz!7{srlk!&0T`CY08<?)gcWQ>Jv)ba*JjbWc^nP=heJ1~1Px*K8Y<)AB{}*}k
zUtHg4`@emb+sVJ)(<X1{zm*k#iT}p8U*hi<mdnhV4+?J)U@&tqfWr0Xi7W2NIY4}}
zDzEKm4xoDuK*UI~V%+5We6PW&-v5%=mdTg+qnOXVSvOf<KqKS1gIC7oV-F7Yw)8IC
zEq>07V=AbqnWf<mE^1hXnw+m}JtAB_OFrwV;fZap`>W4P`!T7vu1GU_IoDt2pMQ8=
zrPlf8z5Jy8^4{I||ISUZ{am*F_pbUqZ*Q)b-+tTwa^-Qs+-?`o+{ya|MC*+rBFc@{
z`f}zk78bd}cxcvxFN$nW*>75G=l){!c!}W&y)ds3vB{<L=Uj7MvwgDhHwWflZa0`_
zfBpAMOMF{q=hIJ@j)Xk*(M>nr&~7t799)`w<65(a?YGZ*2A>Ae-cR$UcU?U-Wnq+1
zp1Zb?kLy2m`RUV5j&`48H@@;b%h8Ef|M<>1m-u=47he@IKi?Sar@s5<h3||x?BD+0
z_f=swKi@r{{YRYiTkWdff4lxk7^p3e{m+IdPTn-F+B{WIjul+uJBmwBz9^;)4pmU8
xKlzWC6Em>Dnd~TT2QFxu#N81E%|&r<Fb9-7CaXxaA|hj>gcUQ$;CB-1nE)Kk`A7f&

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip
index ae0bd9cc8f1f11b5f35b1425f29712a66e0d4faf..877b7b56e992caeaefa3e7d7ca2576efe15fa9ab 100644
GIT binary patch
delta 685
zcmV;e0#f~xB9kJpWCjO!v@%$Rb^eoU1|xq@+b|S;CQ|;xomyaMb13ju4OIF80;y}&
zq}t1*Ds`O1EU_co=|B_zeb;G2S2R8%5h-$f@43h4`Z#X2KK5~)7F?D_=Aq#<%(4fP
zFu_!4SOhW8m<K}%LK<KZH=hvw!H?@y3Ze+OC`zLt6cNbMRNt|ZIhd4b21d#ZAuE4L
zQK%Fe12zN8l4lXDLdC;n#x%H2a5-D}vw;s^&f%xi{ydvZf}>-@wDC-+z%Ce!{NSv!
zI9XhOpD+B$!j??t!E_!BHe+4=Cyb&(v6$b3cl;G2@rg(6a9Rz6Vc;$E0>2(D@1%eG
zTA{>%Hi{PoZf?c#Eb{n2af93G=z4!6>n(Lw&t1Winrk?kz9wj+;%R9=nB7dLqv2b9
zY{b`P*1=IoQ_$ry;)+ot)dS?EHW(?2>;Y71y@{n-`^7~9T9%4pkQ<;<;2tbX^vJC?
zxC_s1bDg~&qp5_$eobIcCj!46ZgV$yK7L`Y3v)rRYMZjollvIqHncli*Is{d!F7r@
z)C!+*!=Y`|`rZYr(RHl0MX0>A4s1?CJ$0S^9fP~LgZnnotd()!KkIl@<^`gZmx$7%
zTVO&dkjW{K1jrBke}UjU&Y9L>!brwMV$$;t5ZUf++HF<=2M1{LUbPkx=u5A=+tvBL
z7ad_7jfZyc2rgd4teL9i$76qduYpW~{C<xZE9Bxu=B6eh#oCL1nVQ<-+d7cTJ3Q_c
za*L`cfe_2i)QXV^uTzaX3Qs1y1JbM```53V!V}oEmw^;3ri{H)EzcH1tIGssmBtcm
z#l4tlqS|%-0#Hi>1PTBE0002AfV46I00000000000000B0000&Wp1+x38e-HceFBC
ThIRgvwGTQ2w1Bj;@(&>aJ@-UC

delta 685
zcmV;e0#f~xB9kJpWCjO&voiYkOsSJ=1|xrK+b|S;uEGD|j-<`PCO2*0!dlXNw6xGA
z#14BI1V@q`b&g~tIcpjF@4Is1W)1YiP(!eF@3}|k>fET&_}Ity8gN-ywTi8vah5%j
zluNE-%NZmh;{gm6NM(UDVLu`IgCE~36)*-u=7lv7O9ra2<#(dh3ha^_4pylQA!~m{
zQK*sz11<xLLSziqu@><n;|6>$8imnWXMQrj{yv+B<9T#BosVbHWEKs!?-0J6!%wgI
zCuS_yJP{8N9Dl_~auQJYIxSy=VH7M@Iez_hDu<)VYlUo6$SU~0jKS?>biEbumJYY`
zea_P-E^Hy34l4ZT>3AHqk1aPgu(5vz2O0NoUsI<rV5}B-&bLDMBIQ0|G`*QjM#Hzr
zwhUF7b8r;XC75Etgyz&L{RpeVSd8R(_6WLg-XuzI{1P$+qY6ziC@fGVQOKgehWyfl
zF6{T{dj~yEmkL__ioi`L0>8C(xf`61UzqE{OcJcxrQ9)*hXmm+^nA6cy%K*?m?fS?
zrErfMTCPzy8eMQ2ea~r|$2wS6f$hLlOW!+ucFJ8m!9$m**UDW#JnIBht#U-^AeBWx
zcfgcVAmdXYDUcud{{@2UWW|k%Q%*82Q@cFx08!1}w%vLaaCC$=AC!9$iN5r@&$~K5
z3|JfEXgoA~ZMb+5vtcT?zq^0K-!+g4kl*hS<Ahwi$XwS%q}X`zKT};>LRSZBagXC(
zB6p~g5(shZT(3D{c%2$NQFt=p9gun*x$9!n6i#5>UIt38xwh_3bv!!^EpH)|Rai%`
z6Zc}Gj%wfg2T)4`1PTBE0001kfwM9I00000000000000B0000&Wp1+x38e-Hd$Th7
T_e`miwGTQ2gMqWN@(&>aPZc$0

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/test30_2.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_2/test30_2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..3edecb22a1d5cd6855c4c057419b1eff63bd21d4
GIT binary patch
literal 3399
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
b#{iN4@2y5#^03~FKqA0r1Gw>e|LpXCKmiU%

literal 0
HcmV?d00001

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
index 4a4480467c3..a8afd3f6198 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
@@ -56,7 +56,9 @@ public class ManagedProject30MakefileTests extends TestCase {
 		//        rather than an MBS functionality issue
 		//suite.addTest(new ManagedProject30MakefileTests("test30LinkedFolder"));
 		suite.addTest(new ManagedProject30MakefileTests("test30CopyandDeploy"));
+		suite.addTest(new ManagedProject30MakefileTests("test30DeleteFile"));
 		suite.addTest(new ManagedProject30MakefileTests("test30_1"));
+		suite.addTest(new ManagedProject30MakefileTests("test30_2"));
 		
 		return suite;
 	}
@@ -145,7 +147,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 			assertTrue(isCompatible);
 			
 			if(isCompatible){
-				// Build the project in order to generate the maekfiles 
+				// Build the project in order to generate the makefiles 
 				try{
 					curProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);
 				}
@@ -325,6 +327,32 @@ public class ManagedProject30MakefileTests extends TestCase {
 		IProject[] projects = createProjects("copyandDeploy", null, null, true);
 		buildProjects(projects, makefiles);
 	}
+	
+	/* (non-Javadoc)
+	 * tests 3.0 style tool integration in the context of deleting a file, to see if the proper behavior
+	 * occurs in the managedbuild system
+	 */
+	public void test30DeleteFile(){
+		IPath[] makefiles = {
+				 Path.fromOSString("makefile"), 
+				 Path.fromOSString("objects.mk"), 
+				 Path.fromOSString("subdir.mk"),
+				 Path.fromOSString("sources.mk")}; 		
+
+		IProject[] projects = createProjects("deleteFile", null, null, true);
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		ArrayList resourceList = new ArrayList(1);
+		IProject project = projects[0];
+		IFile projfile = project.getFile("filetobedeleted.cxx");
+		resourceList.add(projfile);
+		IResource[] fileResource = (IResource[])resourceList.toArray(new IResource[resourceList.size()]);
+		try {
+		    workspace.delete(fileResource, false, null);
+		}  catch (Exception e) {fail("could not delete file in project " + project.getName());}
+		try {
+			buildProjects(projects, makefiles);
+		} finally {};
+	}
 
 	/* (non-Javadoc)
 	 * tests 3.0 style tool integration with pre and post process steps added to typical compile & link
@@ -338,4 +366,18 @@ public class ManagedProject30MakefileTests extends TestCase {
 		IProject[] projects = createProjects("test30_1", null, null, true);
 		buildProjects(projects, makefiles);
 	}
+
+	/* (non-Javadoc)
+	 * tests 3.0 style tool integration with multiple input types use Eclipse content types
+	 */
+	public void test30_2(){
+		IPath[] makefiles = {
+				 Path.fromOSString("new.log"), 
+				 Path.fromOSString("makefile"), 
+				 Path.fromOSString("objects.mk"), 
+				 Path.fromOSString("sources.mk"), 
+				 Path.fromOSString("subdir.mk")};
+		IProject[] projects = createProjects("test30_2", null, null, true);
+		buildProjects(projects, makefiles);
+	}
 }