From d4eb543b1cbb3dc6b0c20cec78adf955df9946f7 Mon Sep 17 00:00:00 2001 From: Leo Treggiari Date: Mon, 30 May 2005 18:40:08 +0000 Subject: [PATCH] Update test benchmarks corresponding to changes to better support output files in non-default locations --- .../resources/oldTypeProjects/1.2/test12.zip | Bin 3815 -> 3816 bytes .../resources/oldTypeProjects/2.0/test20.zip | Bin 4208 -> 4208 bytes .../resources/oldTypeProjects/2.1/test21.zip | Bin 6770 -> 6773 bytes .../linkedFolder/Benchmarks/subdir.mk | 6 ++--- .../test21Projects/linkedLib/linkedLib.zip | Bin 3037 -> 3039 bytes .../multiResConfig/testResCfg.zip | Bin 7102 -> 7104 bytes .../singleFileExe/testSingleExe.zip | Bin 3168 -> 3168 bytes .../test21Projects/twoFileSO/testDoubleSO.zip | Bin 3430 -> 3434 bytes .../copyandDeploy/copyandDeploy.zip | Bin 4198 -> 4200 bytes .../test30Projects/deleteFile/deleteFile.zip | Bin 3868 -> 3869 bytes .../test30Projects/linkedLib/linkedLib.zip | Bin 3059 -> 3057 bytes .../multiResConfig/multiResConfig.zip | Bin 7069 -> 7073 bytes .../singleFileExe/singleFileExe.zip | Bin 3290 -> 3651 bytes .../test30Projects/test30_1/test30_1.zip | Bin 4373 -> 4375 bytes .../test30Projects/twoFileSO/twoFileSO.zip | Bin 3398 -> 3401 bytes .../tests/ManagedProject21MakefileTests.java | 21 +++++++++++++----- 16 files changed, 17 insertions(+), 10 deletions(-) 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 facb60f7b9b8826de797cd27511f915094b629e6..3043611d6193788df3df037f4081a0badb85ee30 100644 GIT binary patch delta 455 zcmV;&0XY8W9q1jP1p_Jqy|V)as00n%0KGD!Z~%;k0RR9yleh^jf6%wEl&o%7HYf@0 zpf81@NU|+vOGY2v!q|V`m9r4KmoccoAfI#Yy~pQzG{$TR}#x@dP9W z+o)TKXYMrLw#p;Vf6C3~>He;~$9##$Z2b0az5Y5o3(AK=^gYtR_2rj8bg?Jw0AF2i z4pl$7l)Y1x{(<7`9U+5E(&blDCePPgH1KgNwNoNkw?h|wAf)fx9b8OqD(m(RwW;B4 zbb>$~Agl>aZzFZhvq@nWIQX0-lX-TsQlhb#ULK0mE=cuZe|qFTQySlhTi~WFQO@Tm zZP$~|9Yr;vY<&*)K)VGKU{$BQ=e1(3GIeN{@4@VNMV(X4f5>rqN@<)7QSqlIF0080((`^6% delta 455 zcmV;&0XY8X9p@dO1q1DZw6g;Rs00nUg0wPnh^G*R0RR9_leh^jf3UZ(l&o%7HYf@0 zU@wEANU|+vOGY2v!q|V`m4gZ0!^WTjfpqS<_a2?A$>e!go=xyB2HWwV1#jB}tCdlX z2PIMIRu#CmFg8F*9bORonOB|-3Z#TKeGDGlNZ1&LbLDJ@&?v7EtZj+%Xaxzi#uJbt z*hk$;JaVV`zEvK1e^%~xUmxzv2Q1h4l1*RUZ?~To7eV<@h`vW^xV`!~hJSJ?d#5V> z1I5KFLI$Fx!>`1=zS;eqDMw~{#tjz@eB4XzlnB-x&_y2z>HGEo7n8usx}#`qYIqx+ zAW#PgYl74JNLBM}R@fCr>9eFe&(1bVG#2x#F*%KgSa0X2f7k~y=o`gWxGhVR%Oy(N z^~7^0QcWn^z5)A8;|3F8Rj0h?wPLL@b!gVF!R&NHl~c}t&~biFZk!EWm?8a}6+L7< zE98PMWD2I61umZkjyXe@yF1#qU^}qy|LmFiT|TXK^5MNU+BfutN2mYr3G?H~egjZT x0Rj{N6aWAKlVc0u1MPyevqlV70u8x>v@&vtrx1k!002&tsSY^?SPK9E003|E(e3~M 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 b4fc1936c2d39960140f2cee7238693fa8258322..5f87fd6e01da7f688d0d9bc1ada1ecfee8344544 100644 GIT binary patch delta 480 zcmV<60U!SGAn+it2nYiz0==^f2$KU1-2lBZI3>P%oB;p;ypyX79Dh^MYTGareXha( za7vP`69QNgHKUO^O>5RF#Sa?*!NXy?dzi0_;}zxyo& zEAm=fvavyjPc_ZXIv)$Pg(C7~_sWiS*=w#95+Bgxsq*ni)(g9+WsUNV8r)xAg3=X2%J z=(Hn_M)=qUs%0>ltg5{zwAD@qt&p2aC%7e83ed`gH>^JKh@+lBDHz+d!9!XFYC|9A zj%tKbdyPO;v1CUXgMX6soaidpwx&|pNoVA?(jIY?ZZ_YZpVDW{m-rfu-#)F^FSCmm z?ZZ`)H4VBG*EbJC{g+g#aXL3YkzBmv%t1*U{qCf5N@pcudNVBU zI>f3E(_`&3d-R=a3*4tE()k=I)eY<1QB-hNtlvWvR}hU>(sJ{Uk&UKOpL*=VCu5B-`5zkk{8yJSJzSVSvtkXx0Rt|Bw38BjC&{FWL0C{#khAf6B|D}?+u2%MpHF+d3Q51FqBM|Jd^&yY12i<(KIm4MJoDz=gLikHuGzx&aesAra>rJEuDPiX&)Gh| zb6&D{-nS<=Io<~^33FSWayiE}bEDI(UbWXmkHdwTzXc_?(5QNPs*Q0hbsnr>Y8ijG_m_$UXY36dA^xy ztY<&&s9)&0@Y9=&%n;uh^WGi)x;pvW?w5?e4;=n|?1s$r)uKNZZ%dwLAE32V;o5q| zRoeyT|1@;iusFw;W0TP$!*yL>n+m1$Ez8#b_UG*Duk>@}P;QAi@BRgrvyK6tWH=p4v zW(LPl!=pgwW?&52PxcYgt-r8+!<03d;bt0|xeN7M7kX^cO?xd>Tf&?CzxMh$rx)|g zR`fX9J&(D&xY$-|@4Hi*1?`r4tnCRqx$I`wDT~LcCQ?gteHyu&7IQ4ltvUQEJg(Br z0x42{UkdJyn4KWdDK*VzV$$L#Ow6{;zMFcFP5u&=CnY=~eRX|)`S#V;d!ip0O7Gtr zyZ(K;`r0k)0$$8sdw%~v#co+2=978Cv7XN*|s)gM%m%g^VLmy?Q74JKf6!b!}zQ902Ki#6*^G#Np-}UQ% z;vDZd{Q0qbU+wwL)1S)<{mhxmYx;ll?<4=ccrM?4QO6wM&CJ5Z00KNdlXcknHZzM% zWd!G@*`j9P+;m0sEE8I8S|<_9cy2O}qyyvm$-a_Ki~*A;NUA7+avVH9nHd;Fz{WB# rFfu3rS>{5M1BJvUzmn8qc_YlgFxg66X|k0RAEUrzPbpOxu2U9|Q%$6n=K3@mH!bE^oLh77O}bsBS;zv@HLrtsCipc6$-KD~+#NAH zL7-D=*`0}xoKCWqec>=WX(m;EDSBt7kHfsR_51GMTa))Ot1r->`kdlr@>*=&{0^{J-`(pIQljaZ? zp_?+lEiyV+A=&GeDINS^(gTe{8Pf3vzh{Qe;}y-|eZ5PBdCBDkBJI^LSGun8HRy2R z4VLpLT=;~Ey^3XbigYjg%e8k*)fCRxo85o+-t2qD)4hg;^UF17O-SF|G);ngzNprDziVz+TYes$af`pr^8GXS zH_FlVpXY8=U1u)+VcE9iY4$-{OBJ@|E3Dcs5MOacKt>~4xM@vKM$hV`y-9PHW!LRK z|NFeioOzp+)thG(+&Nrz^6Z+l*0>Ms(#TpqL)8Yv;pa-a_t=kLQXVGL`cHYfwB2yW`*=U}q88{nV7d^{_ zmW?(_#4?_l%rEJ{cy@Atq!Xjx1`)8i3=E763P6_W?5VjW(`&c09Zq`qyPW_ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk index b7f88c05d88..5cf8f316d2b 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk @@ -8,10 +8,8 @@ $(ROOT)/f1.c \ $(ROOT)/f2.c OBJS += \ -${addprefix ./, \ -f1.o \ -f2.o \ -} +./f1.o \ +./f2.o DEPS += \ ${addprefix ./, \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/linkedLib.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/linkedLib.zip index c13a0f08a7770d5ebb61d2e7dc4ca308634a408b..cdb5bbfca62564f5206b613554bc24557269fd3e 100644 GIT binary patch delta 507 zcmVOA1Ru6UZe{WJ$I~WR1~B(xv3TcjQf2(!AWkoGPhD_RhP~Cg6}5Gh!9VAe*E<@TM?shW6a2i=*j8DBbxnWLJU?m z>IW3%Tk;TF#BDZi50M_5J!QND7iyub%yTS(p^Opl+^MOiDzK2EpT84dQ9u!;)w1L3x4O(^)5(sB;@ z`8&wl50GEeMS+|gO)s5et<1GFt?%Z9W455&G43xz;NXC!v^Q4E4P>tu)qa8V{X!hl z4-E^l#UUI$2R1QdrPVHqzAunpKz{#6bz{w==lQl1`K*j`9X*046@Hr-Orx0b8thbH x_FsX2t3aCk0+ZhfvIC<8y_1v*{S6xgy)w`Hv8Jm5000t`o(nk!;Ryf$000I!>}3D| delta 498 zcmV6+L0k5SO?V#+%l`!x|I%Tviy4Uae0GhGki&wvj$-nhEEL7W&-8=Rn_>GSQqC`~ z4^hOPB6gHGg$u?TxUd$=O74x_q6^NGrSID53;#@_d=bbk$Jg5_jX9^7be)jD|T z(xI#phnr86qq*db!FaI?7xgZYy&mteOPctGu#ysVJ>j;fbtw4WrRE&@)eGeHE99T) z1R*Cw)k)`AE%R3D+BY-8O*W_4k@uGroSe{Tpp-n12}`Ela>no4FH3rGGuDM(y0Le056lE3pobg2><{90O=9*3jhEB 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 bc45303eafcf1be1be69b213c2e303065b7ffbb0..5241ddb45c8b0ce215fdece2248af8438960118d 100644 GIT binary patch delta 2057 zcmeH||2NZn9LF~wnlEc3Y-?jA`BrqVjJT$B4lALl+=(LjR=(e(^o3fXRA||oeE(8b zXe0|KYBX8O*UBm*n^KpeQTcL+`^$a(@H+4J>%7kEocDRWpU+pL%{`l& zE=mvtae6{^y#>i>d+yx>-|po}5MEg20SN;k|?mr}PU(^^iv$_(K`rkCBY zi3poz)@SB-+w~g=+Ey!u5w6&KJ33c>JeaN?UJ_|YtnZ2MH(}WOL|BXUBs6rk#e_Mb zv61dq)#Ms1ayAz5!=FWuuT_0=Xmj}sT2awizA1k?X*93X@tsW;C+51KDcZ1U#T(O& zPd{!uzeRf>+T(s}rNI5%-T_p^Ir&xL=-XoFiISze2@5DuC+HjXLLi zx?rd#*Tc-PyX%sR05il+^vcz#7Bd*V=2LVD!as%?^;`2EkDTn+3|6R}(jD{jyDD$* z>`JT@CwPwEYkb-R)7%@xzB`<`FU``k44c&din)DN`og)^FSb+T6*D}fXG8vuM=2gF zj3*rLKRdfA?d8n zO-3OfM9tnDBjNtbEry9)*pwxIXD~q3)*g zyPIy-89d}_?<^w~qH>k3J!s2j=r0d6mS<3MJ3h_zA0zn$96VRGWnn6`e$HMej!;0w z4$Q{evv1E}hjYrptenbx|Ch?sd`|VclSpcZb^vy$_GL=P4v-5bZX4Y37SsisN(b_q4w2;t6-Jxu8~ zzNs_TdaIT&z;3l=%*PuGoM)Ny*^$2VFUdUr3A7xcmJF&gOpeZOe3tTEb$HOEV*0=8 z{#(^4K#ITxhX*IsgiGaw-da>QUX+O|5(FcO^c2lswT_EUeL++DBF#zVgFe+;2hc&M zuLjX3oGw~D>QD?}uFzvU&5es(&4Z3>+Nf`q*ba+8+&VmY+$=>ybali|BTXyfPDpKC zUrL#_Sx@MNFvO@qjpawB>Y}5W{K1W;xc*X{enrC8Ki1Pkht8&<@K5S5nK0a$9wCqt z-7;a1Wo2{8g!7oUE)_%T|L`JtmW}A3{k1*SPZVWc6rAFYYY!5y#J=2pVh;KY4W5~p z>YOh7YMSw$d!qwA!C!qIY2}pcmy<&lD+~2m1(v?;BXh((s_6#D#gbP$Vt3fmqxXlW z4KlN|tTdhqM>;K>bldhd4=ke;fp89eP1kd8YgA8r$@=aDuc%Vvu}cjf({8T1I(n>` zTouvwRkOUXn-^*8XXS130qXseL#;%YTWw@D z$!FaE!miCGUYjHQFhr>W_ZAUFSN^utiZKq~;C)|eU=%}!%k6P6QE@!nYbGSAj5-9Kr5KJJ!pMrdX&XQ1V H`Ru;|+bf?> delta 2043 zcmeHI`!^J57@jeP+$R%*k$bk$GO@W|iaLy2#D?72gpA9QRALZYVbX;x-t&CV^FA=XXH0Q`!-7*= zfHPcAdS_~j0gGEHS_*|gnqVMT6a^~aKN4;p_i-x9wi?N}xp}YtxPMr=kw>cau<6WL zTqB!0e%7;0YC%tgwN&BI`0@AW3|!xZ9oGwr;Ci~*Qn@x6sP5$H!q7xfn*$|!A~I3J zc*(V-DSQ?khuz-r{Lt<8U5c%}PpxezLFLIxvym%S>^U|XIoc&h_i;6 zw{lqYN{3uO&A_YuAUdf6G(I)&C}w*O@6^D!PrA|%!V89lYuog3<)KOBBSAA~lwt~Q zO)+V1MZ}&J61GSWyo~O%V_)rEB@ij5h0*2@{f?9tFWb3U{*mT~>S@UH#m!KMo2c)M z1IyxvX>L`KfwD%Z{XlPB}E?}(?TFq{{peI<&=6S%F0=oJSuv1lh}j0~Zs z!iIRd1)=E$KPq7nQ@>JIBpq%*g{j+`!d^Q0ao2Ysa$ohs%>6>9X`YuN>jw@bWmjb`yZn3^k|#7 z>~VIF4myaBie%pls&-_zpK?{n7$S_-9bI5l(*n#5HM@F=`%IMvNCvZh?QV-2i1S0{ z-BGix%nU_*2Z7u{m&&eMt$VTN4_edBp21=n9fP7Mt>3Bqr>lcMP=AP)0aO@*0+*B zJRh)>`F!5P`*vnBiPx3PmASh?-47Gcw}VgUHi&?>jr%9xe-)e(cp!%PUvU4e;Gn|5 zNkIvuNier`<=!e(n9J8yDhQKQAqZ5J)JWZ&$kuvnqa8|brxY}(qIC<>Pt&hZUA36< z&AZ4sQ9;Z1IsMf14?%nRR@pf-nmB0rf;==|W`UmgMY3(mT4HQpq6dboEaO0WM%0N3 z3Bsr3n{}!4_LN)9%i+W#I~6QC@+kVtpBPN}N)LZ^FBW2oCN6uDNT@wvL&@sQJM-o+ z*N<$m#E!kQ!HXfRrmTtwG%vE&9#0S8hhihehvIQk#;A7KdX^*8^ys_t-SV8>45Y4K z8It?%+*(47a&dTegx<-O4lsh*-oPRgtz4_-uUh|3P7lUi?#N1jScGdtjgyf)TT zalXu1{7$!8QvRtK0+Z%_c_jFpzER|WnEa-O;`%~!pkN;-G=Gp^U$ ztA{SDvG)28#(b7FdAl6R`7paC*#=)*HYGqsfU zNnry6$vNlVdvY?9$ zd?}{S?>3uHi?dESFExf?n~RTsNV$h;gs-k|4>doPF@3O=`vH0Ol95qnc=Kye4t}qd zZV>aB@QlUQkTWa z+UkZdzc`c*ufUo&^CS0xbNI&GlACos^Fh`=OMR5oT0?AJLDa7yKJ&XmFi>?iMpawU zT3@GT#XL>d+m^@iHIrt+2M#(0)Aa)9kBNQFIO*nwzxNQg z5a0i4?lANGald0C@0@qB;eYm!_+N=(zJI#kP)h>@3IG5A001fiy|Y~f*aZ#Y0KGDW Xq<~(60RR9$lR^tM11bW&lX?s0+KS;J delta 481 zcmV<70UrL~7~mMNrUQSgZKN_9H1(;10RR9}0{{RN0000&Wo~0=ZDDe2b1!psVq|G@ zE^TYAQeA7?KoES6K>uNi?YO2rrO-E12R9!rEd+<8ke5I?-<_nR(yh3Uv?k=gcO@fC z`cPWPf#7auc4v21lgZ1TJe%NSiqy(zm28@wsEjjSMx#;M#uR_JAUKLJ+QwJRe&Lg6 zLkC*Jx-P{4=`<+C;a+-b5o;3+B2mMX2U6T9xxj%Q!8X}O<3V~Ww~YzNv-9t_H|Mu_ zv%-BgeSNdpd|RBf(z-&S7u%eD9l=Mbb>~fKf1x;e%aMUbe0l1b7nj$6XX=sJk8mkf zjgYq5dZQxw9ol~sB1gKe*}$;H}^abHv}73x5#l!Dm2gQ(s^-0`X*I8e4G1X&r; z7+1x5#W+pZT)WTv&lDUVvm-}?ns7YBddb7AW`$nxgN-`DbiKgob6}q{C|zCg_Zi|E z;^#l<_L`^9>m3~VWStE)|Hh-^e>jHues#YAP)h>@3IG5A004J@q_bTG*aZ!%ZKN_9 XH1(;10RR9}lR^tM19yO=lX?s0Tb1e- diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/testDoubleSO.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/testDoubleSO.zip index c4e8bd95c9d3bcb1a9d90f3e6633896bf796bc4a..fc7299dea310c57c68958cc09f2ed874d906c758 100644 GIT binary patch delta 507 zcmVh$@rG?;-6zYdSI7{+b^sGJfk=B&{_pZ({#(~n82oCM;%BOu4AFN1k0i-rrr`V|a##to!zEHv2X>@${jP2mXlt)O&XE z^_g3=EPA#^Y$bepb-SzeyHu)idTD;4IC;mB#8>S-YVSWOA&qlY$`yQEDC4vYQN1-7xNo%Em%A&7M>ZhY-{Gd=4>t4^f>$eCOwfkPy_JaKS|VKMTjl zJo!;uQ&`qI8MElKUZDo;@B+}C3~+u3Y;)S;H#hu!hPZ|J`L9-~&G})8{jk@@8o%Pd z7@3IG5A001fiy|dW|(F6_P0KGB}o4T8d0RR9wleY{t11bW& xlkW^00nn2R4LBqD2LJ#rV`Owrh0ivtHTEqK zR#$C(FhS&1yHlk1r>K&(ktLqlUjOzkE){?5bbC5Si;3~`IXgY}-ut}H=Jmr`o-LZq z6H{aJU6-ycOTECQ9sHWfxM?ZFTAzx8FVf>GuZ1lT>B&v{ps|+e=!JXXeP$flZ%vs3 z&rWck6r)iedA?8NpwXp%1KYy1U{v(nsA@MHmsd#`lGYc032%K$LviUCiMHaNU+RbAs50o+j ctAP^SaE<_wb!IX@uLa}R$sW8iY)oJ&0IA5}#sB~S 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 e718d2738f98f6e7382709ad2ee47e895a1951ba..c101f99023f78006758b2aecb9812c48dbe60a03 100644 GIT binary patch delta 1093 zcmV-L1iJg?Am|{l+XMrRc)gR}1TYOrc)c=M#NLRw0RR9( zCaXp@Vz#c)N18D9-+SdOBv~0OP=P_d=bU@)hdP~?J!#T` zkHKTjy%xNxHmp!aS?-mDTvsZCYXpNHl+^wev0wP4Nn3%GpiL9J18yW>@a;XfSc5N> zQ{WLRqO4F*p=cZhe}YKF5t}wz9-$+5A*q#!ModFL@R4= z@3S>T-}&V34=;Phz?N}+bHB^3;X;Xm1UB-!^fEDo=MDF=b()-w zl_(MVlU=&FT4I0b@3GG`+@FLEVT#SB9rzv<4UwTcj)BAbR(h+Ab|t--UAcdyhJNh& zuqGTHO_6FpwaD3Iae0vmtQ%t4tS})HdtxC3u=xeB;u6?bde^`xkk`sNUMN;6Q}}X3 z_zDAUEBI>)`< z%dR}@!TT7n5y41N*E?2ftDOj1L1Ajm;SRxK0If`TMd}w`dDbOR3XE-I@F1)LjG@~X z4jTxS_8J0WO_B{t3X0Z$6Ob5KM^h`<2xr8))*kZg+mF@bdwrCO&8vju+jmXJ=SX!9p2=cjhr+0!HLg{;8GwK7i2 zfNlp(^nsAJt#{yJidUf9M>e(ukI_j2O#q2DIJ1sH`#c+PIfg@j^a0=I*~L`L3Sl@q zSkq`o^KN+LK2dXi5;ul9w!5xjM^?5ZhW<1G&-Z)l2V;$|XyS)x|6C2j^uhthF?EE} zof~K|Tisl9iA_r?$4eWzJPJ!Gfi16rl{dh?(mx1{fTGdfi&C>%+cH!W;y1vsKcync zdcF%TFKKKST}@^=sln4RJ!vxFYD5Q`8uerZx2MG3(-m7R==%ul0obqqEuG5Vo?dxw z+w<%%P)h>@3IG5A004@3y|a!Ch5-YOc)gPs4nPe_c)c=M#NLRw0RR9~v780RRB>0{{RN000000000103ZMW0Hz9)zzP+~uMZmmgOke-I03Aa1Q0$X2n_%LMs;pubZKvHb1zU!1qJ{B000dD4FDno L001xz00000e#7Vp delta 1086 zcmV-E1i}00Am$*j+XMs0J-U<*0RRAQlN$vpe?Sm?jzIrmi|x3k zJvAk7rVg&1q%>e0;zIIJDDvG&Ix5|Y`*3VR{(JUhgzfglh8zf1J2N|byVvQw?}?)h zeD@Bk)G3~p<%Z=_OOrY&AXBAG;2J@r11XgIKv99ehYM$DwnI=l2aDctN-75&wKHnzowRYZe{`-148M@<;*pIi;TcwpP=v}q#{!<$I;nw>- z;qYKe)cdJT&L)e?i-coU6U!vI_6gq+bIyUyFM#Ejz#i%K1EWM%No&(wvQp~Y6(hn| zz_2?elOR1^I0fhDwAQo6lW7|Ncu1EU^%60lAKEU>X#iJ;z*f_k&1Urd0Co@T`B>{< zdv#dy)K$dM8&FFF1e2c*8nYG$ngb4(JGwHAU@E+;0RR9R1e3lB9DiMF8!-@k&cXeM zEw#8h=IWDUlFZM^h=-3TMQ+(jM~c$FJ4>d<8)zmz%SlYrllbTe-rcO_U>h->X`GFd9vdrtG7aKz{j;RPRoF9 z4|Vi`GEGzM!Np{vKzA@^YzZEtlaw?8B--H2ItK0YY{2ChI)8%$zRR<-sg@gr;jAl7 z3nb2m;Su{nBm7O+80OgQ+p!)|*$^4})0B7`A4)$NYy5`ZMc3LtSHmzl9B>?ydFt-e zh8DBc)g_l$H^g$hw2{jrv6K?n@)B5i1?)S$RA7`SYVEx!HLJ8O!)8MG78v%YB$7%` zuY&V)TGv^t$vG?ycseFalL1#F`k}4SOh$1195~dpVv7ZRpMl*0d-z}JBzyh*%2UUl zXOB=z0|W{H00000#67yRkPL$p;lLinzBnAxt07i9gV{~b6ZgVeCO9ci10000D01W^l0{{Rn4FCWD E07P}|%>V!Z 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 index 5275e36992ad5920dab72f050765c76729d4fdc3..3a56ebc758fee6e8eaa164286bcf77d704955e6b 100644 GIT binary patch delta 510 zcmV3Tj*O@N|v@88-$c*us#fiBFVOxEgAjk62`v!esUH<_q0I;2Kje)zSGHr!ON~Z z8{l0Gw&g(!-ZXnwDWe<@N}|+_DsXFIY=DwFydw4suRQA$NC|Da7(BRuNi z?Ks9gC6G502iHkj8ZZuVp?N5j^W8~0D&2|uNNqy@dsi~Tqz|Qq90*Q3vzpmi4F+#} z(qw=SG1!_1EqGP!S)q(_JSd4=S1QA;g|Puj>hO-(Z+z0Eb08(OX=3o;M#9F>-E(Ja zgi?8hU~NT|XDi64e>I*8ErM;-mBcf5nr|!RktR1!Pv19>Hycdn_?8UM9@pzHlk=Ku zlZo99t>Aij-@`9l%EqZ&?~t9pr%Fe(botdXZ|@%d&Xhf~9pjFR5aZ(~qCO-7lWp|?J2e|@LP$wG-R+yNHra4lJ=@e{z0ajdseWk^N39!6Y-t$7SN|_>* zbHeR#K^kq}f41QCl(ISL)R>`Z7Bd=aKFZ{TUMM0A7ZY5+1`a))(rQJ|C$I;wpZ}!W zYF@wo-Z7bv6WVBB(ofxI|3`8dAC~wVP)h>@lhF+rvj+%O1p^66wUb{BHVuo4v@#So z`uL6k003ZXY^jO#%6nL=H~@jgyoPPXmJs0F$8$7L)uA8wT=IG7x5RcnFW6|YrQgGi9<)Z0RRAO1pojP0000&Wo~0=ZDDe2b1!psVq|G@ zE^TY=Q%!5zKoC7gp#Lz%O5D(Dl{z<32iJC5QZNa1pqD~f@2;e!(vH}Vq^9J*cUEyQ z>8Xa$Qy0WY^Yv!m8;wRUd(vbCAA-k@do6g|Zu43hWw}=pD&2o721^8k9+cGn6=lEh zNt0m$DM6b)cn91_z~G1X%3=q;QBHwJY$@dq1r3VEkt0T66Lc%#j$6$)t#Xhii|^|% zi#5EN!nb5m7E2VNQ)btBt-RN!c17#0s%y=Q#qxGFU*9U{i|QQ{hZjw#DBj|F{&|PW zVkd-XC()+K^74OX7t4NeDSN9b{S#R6mOPXzqnQlmA-0N?TyoKX3md7e5+3aqy5Kx{ z`o7(Q4e_!S+D8ItI&c`QAgA^q(0Hpi!7G=>{#e4{Or*)tOo;|zJb!|S3sFM$e!P!e zkt9DTRsz+YpD}@5Pg$1LCNQy2tc8I5`V8{=9P+QUXpn!Cqw17%yjFRuOzoQ~#W9-^ zLaaNm1WrzfzoP*yH;}!amB$RH$4s8m2hj-G>=Z7Z2Oet%q}7U^Pmte0e*agv5%c1C zzdbJ>wb8DjpXf=SKX`+2lsWFl!P-pzYx6I(Nt54DO9KQ70000005og8G5`Po00000 z0000001LC12cQEDG;6&wUx`CUxd8wGY?DL_H3Kwjy_0+k8v%Ngm=IE7xNdenFW7Fg{m^vvvH2Q0RRAt1pojP0000&Wo~0=ZDDe2b1!psVq|G@ zE^TY=Q{QXbFc5yO!T-aJxXsFDyG!59QnDo7*dVklg}n@hBAsnfSu*<3E{y%}JGl*^ zdl(CpJxyRN-`%J0{C%g<=y_L~jNo1Hrej`mrqniXP@`oY1=N31VF616+IT=A{R^so z=9MNx2SR|Lx=kDm9qEjEp0!_$ntys^ z&3-T;dW*IE4n=?Ynj&^RO^!Q7F^f}X_0$lx6lRW zDbn|93pPX@YGWU?p~k_PU^xY)2X3^tauYndbZD!B!$nGyqZ#tnz<9o+h_g~b_IA9_ zeI&PTDOUku&(8{Ox}K_R(dba{ePP2n3Mry-b*cAOZRK%&u_ZHINH3Mm4p46{P*Wy_>(5T08mQ<1PTBE0001;g{m?D00000 z00000006U-2ciQFMun;}*0XVry8!?Ii<3eNH3OZ6s*`#P8v%TimJ2umrIXJK90v6X H00000+2jdu 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 4828e01bab87f69a88c0991a60ba0ecdbd527807..1101a419c65912705845f0686c4ac7818fb63c42 100644 GIT binary patch delta 2084 zcmeH||2NZn9LM)DHO4YVzGd^Jsq9*~X<@$2O}9ka4JThxqRf};x?wwVH_9pv7w?(A zY#h3UD?1x@Ptj;{tE(bX<1Qj!3i;BVNUq#X_uO;)3+^xX{ln|L-sk-~?=R=^em-9U zQaMR*2M~$?i z1t&V)7Y^N&pX@KTbooW4OcKyGI(Srqf^Kq5`RBNo~y0Vp{=xOSwPh zG=gNX{meAqEzE}7PSA`eRFDsP`_{fq>9X$K8L^w3T)8NuVrg~H6PlB7C1JV8-}B~P zcnIZ@zL=ydEX+iD-Sry_@{6%%4b^f^XJ^|Rew15l|MFPX+-1MM9mSK8I|^Uu|FOYx z{C#B}jnMe2BKt?TYJq{Q(S71Iynma&*0qWV=Jk@m}2KVrv$i zc3v5`Hqnaqy<Q+V_ zs`s|tHRt{4E0#y=l;0rw$<>J3SeAw&bNNp?rZ!7a^0IO*v&VO-h{+kg-(i+JbYz|d z1^U5}nn;*>B&~w72JJ{)c(N+*Lz331q1gvZrmw4@Ey4j-$DS3zQ8=J8JbXUh;f@ed z)%+!f&ZEMy;dUbmh5FjBd~;C(=l7z*k$9hR*39qK+9BzIv6_^+v}5$Njr68h7J@1c zJxH`hFLajdDLP;}$_O;b=?KbYv&GP!iP`gyk7ET@`z`SeTWSVndD*p;`h9$Rw9}~3 zDT#}B>2=F;)-#4{l}&GmYYF3Jfbs_+*|jU9ez8u`K{pAQb(xS32<140O%h>KPh!(R z?wHHM$9dcJF*%`a>GMM*JkvD6{B_h#TK&o(l^1~j;P#Pn(x-rDM_Z{sCSNArygyhY z?Fq;^+z;&>g$uYb%*>jJ0E5Z=ej0drq1y+c70){LWXW#xi=0Eju6J7+26Bkk_C&8= zJ{b0MbEOI zDw6XEE(N4-5c1ujREO=!W(C#)Ooj zW`!J~e%IIg<%r<88tJ*vatF!SjT0gwg@B1H{J;(=eYcK#N}Om6&kp)7;!P);j*7Z^ z+BZdL`x^k!J$)=MuPD*X-rCuXxAd1n5hHz5X-laKjHWv&SzG&N-whvA(wyS6#o@o$ zQ)Q1PhH;m0+VVT}1;sZ#`^pbYrXFEtb`GGs9~fFN@iBj7Y>j3=o+^GD>ibGBwh^sO zQ+$BEz?0a@U1#s|w1mncFN~ESZ{ST+l}~BjjmyI$C%CM=V|~9;AG9C2<+`TwV8O)H z`-kpv-a^UH2$`)cym#F9Gx)zK8>{O!f--4q(`_V$p&qt3m@&0H>M63i@4 zZFa7a*dLWx4xma7IN%q{7~zMga$-8}VYge!iS*g1wx`*|9?PU#yQ^v)bUijm<&V zdYe^_|1>!O8N0*PuBuwq;3I(^%7_r?2Wc3>KJB0~S*KO!{X1;@fF!`j)E!CyS*o}IT1=fG3-Hd=Q-gs41sEgHVvGbq rW>}3%3~0e%0Wh_5;iy&uk;d*_@xbLMxS=knJU zuN81Lkn7TGL6HVo+Xt?-EqBRS$A=JzI-sp>07f+I*gcum@_R#(jNK*FAdXvy(?DNB z5LkH4gM^Khp)bOrK=nBgF)Nl-1F2aoz(Y%p0-jKeMW}?d{OSkvqcVENd_M`0SzC zJ@$W4+3Wb^)vd=<+1%_hH_4&9lU+;L`^|~v@w3L=q-i4kh|ii>_AOqar0vz-$nrfK z`{DzeT8hPf+02(q56U=xyt1BVVaJhuFKy0J)pFHniRpq>j(1PEP1z3;v~AZ5$I>&X zVZ5TYJTt4T6O|#U+y_V2Z-{{HMRCVAS8rogvB|a(Ls=nYOJCNFqN~E>MM(uw;Ohg| zicn$O)A7N~lEFeqmzh%W^FZc~JX?3OUB@JIMTA@Ka~`M05_oUA8&P)WVCPb4joT^@ z8NK-{wsX_?H`1$4wc!=NO(AYUsei({6`Y}Rp+7RMDraKltoh448j+IKQZH8v@Ik6- zq7lmFI?u=yw4xUw>59Auy%wY7MKQXBxUS%}NEMK@tk{y{63XJkj0|~%_sznrEh0uA zz2?dtRyW<#6Mfhm=YBReFmz{PcdXg$$6Q_Cu6(-Ba!UTew@-_l2=Kar@IB8tunkj~ zq1Ss}fpn_^>9WpEQ4|k>ff8w;jH^J3^VIC=ut}B%sXW}@HGr|yC>=$sT;iWzjaz|Z zSCnU{bHc@&nsgORPmZ2mRWm-_nq((wVlFBH?}ys`jB(u~z--3vMP^biOi~DW1%tZ?k&|E_ncCL>TdsCYSc6R|%GmXyw%-VQM}YI@xi0fuX#xR^&pBhGOa(thmCk8O1L-$Sq+4eV_kr6!r!{{ z`CoJYt>!=nW^&#QbNhJr@)hd(4oI-Z?C=<(&Ehl>N8XH+9LTwmU=mk`sRXrGn5;MS z?P&M>MEDZ?oPVmeOm-hW_?9xbk#Bz#`BF6ee)xy1<^oy<>wDOyD+^_n98L{K-*6Tlj2~ zlKXs5kJ`kkyz}tK`ulcK&wO|GCImLNWX#*-lFc%XX>1tj^$wko5Ll;Tvu507U7Q$d z;z?!8)caB0j<>aB&s)6MA5H2*%mYJxI}XQh!&dkCiMo)6vK)aLb!c{cE1A`<)7oE} zeeDT%n<$!zO>wTm6+B51yu*j2Xisn%(0POliJSP z>!)D!d9zrNJyq1`fjP7m@F$>6zI0mzV&$h=2w|eg)U|-CfgX^fHGq}@p7e#JkqE@! z7cUf#0T%-=6%hu!$LOyK@PSlth<}{m^P5w&DNmJap{)T6q*y)6g@(@)e=&g8LcJm? z2lyUf3>~3r;9*FEc7ses90SdU4v-<3GIUW*)I}hGK;IaI5|%=jK{CNhMH2_iaYo=3 b!2-Gn&_oC5A#f$SK+8Znk*My0S6==XAV-j! diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/singleFileExe.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/singleFileExe/singleFileExe.zip index 273c3caa46349dc15bdf864c5b91c577e958f6aa..f6968935b3190b64bb1c370e56bc6ca310dff6f3 100644 GIT binary patch delta 888 zcmca5d01vc8Z)m})?TA+D^5jqF)}dtO)h3uub-lF_K@1v3)?qLG08PI#(fVdpn{Q z8f<;GqjZCwleVzG=ig)6=YO$y9lT+7lp#?xrt9y{59=J)lw9aIcU9%4m8aueUX~Ib zvy)f2q969w-?(C>a6YeYoqXQ43j4$TIX~VdZvACuncuQ8W|48U?moN8HT=8f_U+wm zf5nDtY1De|&+LExFe~o$x%hBpa9QR1mNf#G+$7hhmejSYwR(8mzGnU7imK+E`^$~D zxfGoAX7X(*F{|3_8Q5+kU1)w(@oC3t8|#_bk(NE;?U(Ynmel{Wuq%pR!N0#_cGAv> z__%_Xv!;d2n{HNEDKagnX|3LYQ{Efio5UJ0b-A@Gc%9A4Jsokj<9^f5hjV;(UHZTN z&`rtG=S#k)OnYZM|I*Pk<#lRb9DNTJ*d4s;ofLn0w(j&T_RV*j|NaYqeeT<|*`m{L-T2R6~7)3HiimFhbH$h^9dXWP>!i6-H32j12WBr*U0IOGR$nrp!R6 zPp;#ZW|Wvbi`#<9k#%wmtHk6t+!~C1H|vxybAHP0FX)tD#Ge_1Z-h}FySQJ1f;M>3YY+I SRyL4oULe$BW?*3E2JrwO3MfDT delta 521 zcmX>sb4zkV8Z+-C>s>~%@+-NVC_`<23>plJ+Qa}HT#p~b=v!e`&qA^{6_kLLCxTfSn$GNL2H?2J#=kl_Y z@RXgr!d3mSzW2seD~0oU`|{=UwpDCCus!F`uf)wijdo|WY>ZiCe0z-@|C9WMA+Jjl z>l)+ts4kgqx$Do%Dcj4x`)gla@Fr@9@Fph@>(o8dF8*YmC8DI58!i7JSbSZ-Oy0a*734%ay=t&fHyM>7Xt_|+U?q`%Id;8nU(t@T0}kOHf07%PnPD9 zW)z=n&SSyoFu8!ok+Epk}U4iWJ~)}QY^D2f4|>dJZBlF_LYFY$a0QOpu0_UoMMmKWFG`u@;cyw2+E`O6}u?&Ll`FZ|2z@&ieM|zv+Aa8%W*@&E(%4yzaPy7@#qIbP zuMhYb_T1W;k@ZH?&0^-a`tsQ~qF1KuJMu42RIcE#rl^V$^PPO(e$J5j>Lq#i$MoF(*P(41k5yNF_`x@$fG?+pQHSvx^MBif9sS`-=MTGV z2w8DNZ+C7&cEYZktF_k2vZ$+Dd|GUz9BeT+E`9&DcN@jGUg&$=p0=JfJU^-4%x7uS zMUMN{3Bn2c@2_m%60_Gcu6&lqM#)pz%XWSKsLA)`k>L5-&N~aeyb^kDv_^7^J)Aou zIrw3!$oqyXt2^qx`UX~ryuNnndX{d_((Z{BWfF1s6f{XIec9r^tm{A71H748 zxEMg-C@}ef8Bl_oVKW=&O7vv8hu>5lQzcBF0Fd!!vVedEqv&K$0W(J1$qhhu$>f~^ Rri{gt-wP6Qx1pwFFNH+ig delta 755 zcmbQPG*xLsG8^wq>s>~3s;#-=nHU(ZPcC4St&jD;Z6H#s7WD7%+^B?%VvP@Bydl3B znO0_BU2^O660OoXM|3tS-+t*J{J-{krgON7osyttQO*0E$DjYQ$lGf7t#Gbb%rv)W z3m=-C*~C7{;9y8b1dHMM8SKuSPErYi=JN&q9_)V|!nKHFhlbZ;MG?UhmqPAuoMbs; zN+z4zDIUdoZO_0JB2vs|%%>-%3$AfGdN}o%$qv5)%jh4Q8~NkUJzReIpUrHarp3vJ zw|w+jaX?R^=g)&Rn=K+^>gVhKIeBQB&$ELiay(|qv47Qj7CCL4alg6zkErs;PWQJ3 zQM}EG4|G2>?U&PizohU{cPU)X&6<%{|%<=48UVdrBHPMVc% zF>9Y%#^Ohrnf5d8`Yd1kFuFG9$o14~2LnBVFFZAR)D@_FmHEk1GYQSEH;f^fdpnm# z{XXi-6g90YX@c~Epa*g~-d|3vHQT{`KDT)8Ub)39TMpOxCitr}?U&6fHm|U&OI*iY z?6@Io_NH@_e@i?x+hQGky*{q+U}=}x6|VV(hZp8v`E`$V^~KUP+gw-d*}|9O=WJU# z_pfa8?j6m)%`UE)T6o|7bw$WC)Kh-}oSS(q@sP(c zm!wOd`6h@8+JEU zt?JtM7&EU;{QLL1@58{HTc;hmM1zmTt(%tKz3}SVrcGYSoZBA7`IrR0wW?_{AlZ6B<7==FGN}T`z diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/twoFileSO.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/twoFileSO/twoFileSO.zip index 71b5444b46c8044c98562d579fc32ce92b8d6607..db19d13728c38951fc6ef05acf4e6dd5f933fd33 100644 GIT binary patch delta 542 zcmX>mby8}>M2^W$T#H1RSwt8Z7&sVovi2JF8+lYTF)}bHO^_l*JPCe?`9X7krtm@fRkcXe@3;evcYj<@g5tV;`jRdTQVX(W4m(t=XS z9-Y@!(IL08!r9htFxe`$Lpg%$!l{0f?c?SA~uMX488o2F<#EdSpBJ4%0PQ14~$&+LyLDZ2~BZ+*VO_W!b$E9Yu8!#@-* z?73_-;dYX2?E{a?SE6^!Xwf_Q_K0-!!Qhff&1w#lc+cr1U9dY})#P@g`yJ=ZboJzV z-SC!wDf4H^bz08<&HhHZ|D}1dvXA=b)!vGkcMVQ=o^n&w@4WVmUbtaRo=wus>$VHo-V~gE(Z{~SlC8`#_w36l-b U@MdKLsp0}cKPCo-r(7T&0Az6B&j0`b delta 517 zcmX>pbxdl*L=IsQ1_lNWhRN2ujOJ}MnOM)rz+gPtgHyd;bKB!t-=>&U8v7Q^U82hP zSm67{fOC^-#B8(qYb{Kd{@=U0nE$cEZ;^wFZ_k~{O84J;@AW#H*AIhvwrDm_OpSft z*sk~UEe>IJ$!zz zY2DfPTV~(lzAo|Z_9m ymRDkO2#*Gn9oOVK9&@I2uF2bZ4CU7WO)Jhf(n}8TW@Q7Z=K?}MCI*H_U~2&9t=+W% diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java index f905131855c..fca6d0785c1 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java @@ -130,9 +130,9 @@ public class ManagedProject21MakefileTests extends TestCase { return projects; } - private void buildProjects(IProject projects[], IPath[] files) { + private boolean buildProjects(IProject projects[], IPath[] files) { if(projects == null || projects.length == 0) - return; + return false; boolean succeeded = true; for(int i = 0; i < projects.length; i++){ @@ -171,6 +171,7 @@ public class ManagedProject21MakefileTests extends TestCase { for(int i = 0; i < projects.length; i++) ManagedBuildTestHelper.removeProject(projects[i].getName()); } + return succeeded; } private void createPathVariable(IPath tmpDir) { @@ -254,6 +255,7 @@ public class ManagedProject21MakefileTests extends TestCase { * tests 2.1 style tool integration for linked files */ public void testLinkedLib(){ + boolean succeeded = false; IPath[] makefiles = { Path.fromOSString("makefile"), Path.fromOSString("objects.mk"), @@ -275,14 +277,18 @@ public class ManagedProject21MakefileTests extends TestCase { createFileLink(project, tmpDir, "f2link.c", "f2.c"); createFileLink(project, tmpDir, "test_ar.h", "test_ar.h"); // Build the project - buildProjects(projects, makefiles); - } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} + succeeded = buildProjects(projects, makefiles); + } finally { + if (succeeded) + ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles); + } } /* (non-Javadoc) * tests 2.1 style tool integration for a linked folder */ public void testLinkedFolder(){ + boolean succeeded = false; IPath[] makefiles = { Path.fromOSString("makefile"), Path.fromOSString("objects.mk"), @@ -308,7 +314,10 @@ public class ManagedProject21MakefileTests extends TestCase { IPath location = Path.fromOSString(MBS_TEMP_DIR); IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.testgnu21.lib", false); // Build the project - buildProjects(projects, makefiles); - } finally {ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);} + succeeded = buildProjects(projects, makefiles); + } finally { + if (succeeded) + ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles); + } } }