From 61c6b0788f2fab28960179bc171922af6f8e2fc0 Mon Sep 17 00:00:00 2001 From: Leo Treggiari Date: Mon, 27 Feb 2006 17:57:02 +0000 Subject: [PATCH] Add tests for new default dependency calculators --- .../plugin.xml | 12137 ++++++++-------- .../test1DepCalc2/test1DepCalc2.zip | Bin 0 -> 7156 bytes .../test1DepCalc3/test1DepCalc3.zip | Bin 0 -> 7484 bytes .../test1DepCalcPreBuild.zip | Bin 0 -> 7204 bytes .../resources/oldTypeProjects/1.2/test12.zip | Bin 3150 -> 3131 bytes .../resources/oldTypeProjects/2.0/test20.zip | Bin 3714 -> 3694 bytes .../resources/oldTypeProjects/2.1/test21.zip | Bin 4363 -> 4322 bytes .../oldTypeProjects/2.1CPP/Test21CXX.zip | Bin 4450 -> 4413 bytes .../test with spaces/test with spaces.zip | Bin 4331 -> 5182 bytes .../testFileWithNoExtension.zip | Bin 3514 -> 3497 bytes .../tests/suite/AllManagedBuildTests.java | 132 +- ...ManagedBuildDependencyCalculatorTests.java | 240 + .../tests/ManagedProject30MakefileTests.java | 5 +- 13 files changed, 6430 insertions(+), 6084 deletions(-) create mode 100755 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip create mode 100755 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/test1DepCalc3.zip create mode 100755 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip create mode 100755 build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml index 59bf46f0abe..22d788617a7 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml @@ -1,6018 +1,6119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip new file mode 100755 index 0000000000000000000000000000000000000000..501e3f3c07583e9168e11c029144937c7be2582f GIT binary patch literal 7156 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 WnMpr~0zHusNRkxq_ym!J{= literal 0 HcmV?d00001 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip new file mode 100755 index 0000000000000000000000000000000000000000..8563fada3c6176c1c49d81f601a519d8e17b52f7 GIT binary patch literal 7204 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 literal 0 HcmV?d00001 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 62345aa29491f640003571b5b032da67bb520bd1..b74ccd7c9845c4f510921aa3d686a70c3515427d 100644 GIT binary patch delta 446 zcmV;v0YU!G7`qs-9RveCdRVg{1k3{x)p=Mn0SwtEXaN8K1_J;96abUo3l@K^QeA7? zFcf{B!T;g3NpMH7H|SevAg$Ak4NAi@=!>B^l46V6x<(&?{QF%yB#`cD5P?28=Sb)1 zN~6(rTO5t>7(BJ5*P?8iLs}`LZ0VK6PB$vUl3>U~N$qb~edQKMLjozGO&7dFX(TB4 zVZF1|!q>_vc%p_SdlDR!jAMVGXRr;rk=U13m)k};#8JLpzi)o$8%*aYqAdI7mGhbC zI`m$zPrpvgk)Q$YH!Yvnmy{f+KHqaGYPhhK+A8769?%Bo8R@#_02_Me9ob_VZ7Mhl zRxqeN1Q~DjHt>;gG|6ZN&NS%*#nG3A5;fuJw5_lB4C9A0^OJA7+B#)~2WPY*@XoBglP#gT){XN1@y0UIRe%dE7~uI9gYs^mpASbThuzq5}CFaZNS odRUXf3jGb$c~~?74B01W0RR97lgtZK0eq7n3@8TE2><{90GEBzZvX%Q delta 462 zcmV;<0Wto&7|s~59RvfdR#meg1k3{sLuOSpx)$7NdjS9dFq8QQ9e+)0<1iFF*Wmv! zOOm=J$h**6XiB#32fI)j+Cwja;z)`u*48unXvx3dXPX4t%kH59BQx_xGw(^0$=9wl znc!y()Rw`>vT63B(pI}NXoa0=bdDQ>r2wr=_{P;=ywYSypcIVlV(=)f0>v==?;N!V zwe}i;sNs?~k{pz*XMdn)u#Kiscq^SLw~h8llVZJoeSRvQF<)Ync z{(WFZf(E!3-Q2D}Qfi?3e7B{n;p0{rr)40wM;m=$r0beJTnFaz^zz93;*S3?vwy&SQJ|R5QBd1)l{=PH z42s7Kh!?&-2nn%kwfAMEMWbyM>g5jz+GNw!CIfGmo2=LVpNv%*Sd-!Olm~M%I10q$eLnBl_MNfD*ZfKkGygC* z4n5x8Urqx07Tjrj0RR9nler610gsan3@8TX2><{9 E0B?fi9smFU 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 a29b009efcc5b0bbe5a9349cb9c19800e4a6f75d..c890dfacbd4995700f291e7f8a858e5941759546 100644 GIT binary patch delta 471 zcmV;|0Vw{09qt^kB?SYvYFM)<1*XU0m-+tF_lhW?B6IhndIpY4TtI6bj zN19CVEe7gjFqLfEgQ&IDP6n;8Gp)|CCRhs4%7l-ce&>-UBY{#dwvWL>S_O(>T<;up z2#xj{fvDxko+<_<>wj4o9BiX$7535@xox#aniQMO@B3fHJ?2Z4NuGas&_0~!Ro`PM zc6asjXgxbL>ch76_2!MIMsGm8mQ@2Ex5_wO1#$;;(Fa!gzCFOjq4@4uTC{WDjD5&c> z8I6#k(aYveJ;;fd-zwQGMlc-4E(w*vjOY>5xput^1M}uVKOjEb~>ONV~ub4 zN*}xP>V!G`)B@$dv#$yP0t2>cSd+61{SDP@STqjz63c%9003Q+y$w?Vo0Aa^Ljg3C NRSqWx!wUca001~|-+2H4 delta 491 zcmV7^s!Ol(K1dqS9778MMO2G&;uv!BT)$CVb%NGp{rm94G~2yBIvARiGG#{l-y? zP;0Ldh#C&rQprZidVdCb2J2`Vg{^c(t{d%AyB+ozo)IQwgW!Iq> zd%6F9p#C#7;Cuf0(^c3K0U+bC3pK`s6tqVt`;+H(0r1s>kQ*7?l#7YYuueu`@F%|^D|#h z5KD-^XLPyucNTZ5d~EtxV~wx*H#toF-PE|e{g?9(vzrP50t2m9Rg<3#{SC@yRW!D3 hBU6(B006O*sSQ&Buao@^Ljg#WK@KMd*9!mu003=k>`VXv diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/test21.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/test21.zip index e667da1c81c5cbd4f4cbde8d1b67125926896376..2f9f1716de478ba7db18c4712193e2a40e27206f 100644 GIT binary patch delta 922 zcmeBHdZf5PmX$fODq^w%s~U3*koIIX;GJF>VWN3&`?efL1_sN?ZLDhblVYjC?w?4cXxyDF4GHlvz197hxXSn#XBfB`+K7SX8NBA6iP?X>NLhK822Q+;gX)XA#txyw?wX|*!m_ny}MJ%zEn)?=^6uK5;6 zXX($nnS5lywmH1_`A$eS@=nxofBbVkPyP(6Ulz%%65AgIai;~oUr=;x(x#hJtS_wN z+v>KLUn`W4ZEl*17dOw;t3^-O80`C=e6iP{ZSsq|9Y60~b=bg^SP`)z&!1=Ry^Wu| z>TiE`ohlJGiRHziEax6OCd*`jb8-r2<}3VJlIQGkXqV8jl${*j3yY$^thAfk_rh>_ z^`vc9=FKydzU~&>?;E|Oc24#Twz-Z{4123G1El{Qf1Psk*vsurDZ&ghS&q-2<)P~9 zc>L>z!|K&eANB>`5AbGY5n*6p;9!VJ4>fuGZ@0x}JN9B`aI|dt@%&d3Fj`n9@8goe zjF#rRqO9pxH#TY%ZB<5BJ}1S@fXH+~+0x`RYmE&wB2@`?}BI#i8!< z2;=1zt5-S4c!$MZ1uJwL-Rc{A!>2ab8h7PtWh(M)`ua*a`ru)KPYRxL*~>}}E&LeSbKn0@ z$Ht>KtBhjfxE6`dN(nyZy`fHd%EUVhEgjyjRo-+vl-*$8$2*HGp9Sn<=)PCbbc)ga zZO^R=^<0TB!aj|kz6i^)nJb_4ZuyuQbor%7RrBUgZq|R*R9mm>Fz?!sd@r!qQe0$? z^PY;P9Tjaqy7~B$m~KZ!o#v7Z4-#J|Gs$kg|BH=Fs;8A#l`o#s#Phpz$9d}`cK?me zEWW4F-w@Yqlg0D@ap}gK*I#BU+;nkJyI2`)ymYGW%k$QypBJfz)Ywdw-|WxB&jijP ziF{_@95Rc~0WF6-=Zj?&pX|!-z^FO7jo*oJ)#Q`>D)OLQ1dlFe1_n@+f&e3f0+5_E gnMc5pQEjrHfD2>tXjPLS1ttS6XjPL*1uzm^XH_(72jSp>0RRAJ0{{RX0F%)U zAb+h=T}$IY6n!?3|8S(OQI^Rnz7;E7;|IGS7W?2!LDHFNGHf!p%!f<=y*DZCq9XX< zgplE$bLO1fJA=XZt~43oR}9pa!N{^{Hlos2yE15nm1%U2Yl5W!txPy%_BXFI=@Tdg zW7jcwlvaUa==Uo}EkdomMj&dK@l7IDF=nyQUX%t>cXUb)xJ<_Cjoo zkUhcz>}+ zesg>NGBUUzifdw%aAW)T0r z11sguzv*|s}T8)v+XMq^`JQ{sx?D8gtPfAI7-uRI$PXbtPODF#TV zK`9RJ8&4f#V}d~>YI)?96bB_27=P#)tdnguUZuBk-I{0tg8_y zdBvcOP~@Vw>l97Mvsp=VaGqJI^6Y47R71Gji~6SLn4TY)JKpJkX6Cr9Du3`r-Iizk zVW3tD;^8+$eFpK&2M58xrZXYP+KAS;IyMXDX;n;@s{;HuUlqOn>rz%0U|oUZV=m`t za2AfCljWQ@w3wCpw7~R)+re~sii^+Gs2d#b@A z0RRAJlfDjJ0W6ao4?qDvlU)x&0l$-=4A6c4?)IvZYrNTivJ(OM)Q}CAI&;>`xwXG&qnF z+H}D?ltzMrAI@7#Eqtw$n%-Xta&&2VCW(p!(CvxO2h;pUL4Z-3Ja zte>X=95f*E6y2veveU+j2A@$-mZ$I7yO9UN!mf_UxZjD0gEKZN3FEc zuI7(>sPaiwn7r@SUrtfnq_oi8H*p}z@H;ni&fJ;N z=zB++jPNT4>O?S7wCyghwbf1pt*|kzF0dq63ed`gA6)&-BTa?`O2OD|3?9NNPz=L- zclwu=86L_Kf8}(FlDaKdxnoJq zFn_*6USA{s!$*f)BHwh{dr|AW)wT}Job}ae$*&iF?yK|h&&73?D{j8eMXaN8K1_J;96aWAK r000000RSKX0085YVGuz9eUqaQL;<>!=nzc-Et578CI+<)00000tw6wL delta 966 zcmV;%13CP?BH|*j9t8s+M^%#{1ttR|M^%$b1uzZs097_TbS9(oBZj-=S4w#MkAOa6Vw4$0Ck3q4dIBxc^5 z_cWu?=yO+^jPN}MYRh0`*)&^GX{%isw8F+TI>$A^Qh-(_95ecpSDFkCl!CEc3?8Lb zpcsbx#!-tB7R;*j~l zZF=U+40lC=Vmd`ZZO15gfK(h54__gwZxByBcL)iwX|?xdrA4D{73w+XX_bu^s|5&Y6g=19|1c#<-4f(o*js2ywr;m0Ett7O~mMQxn%G8&DoZB2b$zPFw_#Kr`JNYwJk8z~M-E--)4GuR~CYP?Br<)$?Oc~-qX|EZoaUt*n=<+n~+ zS1R;AkJtAHe1vI$tJj;`r}u;&h(6h^R1HGfXzPuNYxZ?H)e$o?G%`4(n zJD&2#k(xpA_#LAD0rA3D2caOgoe4qKMzqG&u~{-t>tecE7vR_By6E+vm$I?|>k6Em zaXlx4vv3TZuNHiy<*d{f1*YfR52mXNTz#ZQ-Qf7}z|S4T6U4ty`H#+5ANM>~@XIeP!i2(or zag!GhT>&+dbq_!Ra+9_XLILxW`41!@^8i&ey=e$6c>w?bGy?zt6aWAK000000RSKX o008$2lm7}9lT#2X0iu(B5JUmrlfw{A0aB9@5he!O4FCWD0P~T(Z~y=R diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/test with spaces.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test with spaces/test with spaces.zip index 26e7e67f662d5192fc3061a679c4669643b8693f..1c12a4fbd7770847785de6d4922e3ce494d0edf2 100644 GIT binary patch delta 2276 zcmaE@xKBeOz?+#xgn@y9gW+>Zgh`s5SVJ8X14Am$Mu~PNxqUN!yFcJZRkBEy^&meZ z1H%%g&1aaD7{!pa=Nyckc?W3NBgV-hEN`S>Qe9~gCMF#b?<0XyX+SK*Fu8$GWU?Kr zNKjB)r>5#tm9!(x9D8|GqjJJ+PNAY&F=#M(*A zOaqo^Y+bTN!~fucS;8kCK3(o9UqW3 zu~$Em)&+FA2+L%9PUHIM?As0kt@E`n)LU$oy%MxUiB< z-~OcUbR~)a2@$dtORcboJFU z3M;JSKbMny!Oqw3Q2e7SMN3b%Z=I%F|1gW+sPBwW_i5)R?Azb)yHEQOH|;_9uEyd! ziVG(S{k$9gvBKdo7CHFBX{ zw`BJIqd6}28}=`fyZC>(XjaLj6JpsD8{?-dNpHO8RKjBN@r+;AUyegEk~5U7uRJ^U z<=FNbb)oOQc3QgX`+3gTqeP&I>x@sUYk={T#0-ophRF~3#p>5iiqF1nAaZnm`iF80 z@1Q+~Z}`56Nu7ALCAs<1CcbY<8eL0nByC%FaeiOT@7UemZi=@LujolFe$PL*`2E$I zf19+=Kl?F5>8nwc>h8RFvtyF_i!a`|c`oFJfQ+j|?&Iub@fA;RK5@v7Fkd2}Fqdtq z#ozZfUpv-vvQ1o({A8ktbiJy$g+bZ|-))yGrrbM~o6huUP2GT_I_ z`iINM!W4LdW(H{XtlB<3p6`lghuVs|8!>nPa$goUyH=nY+C5?0t*XUJKW%@BD7m*S zynT52#k+lfCMUm^V)2^S-_RTIWYPB9BEBa!2d7Q@;jLNuEh{&~dxwpTwO?*${n4X_ zpJ(p=)@$>$vb3Uf+wOO4}8uoH~(y@*CNoJORazFZaAJgef+9<~Qqgb&k@K=4v{7%1Fn}dxd zzecQM=oUS0w0`a8g-@$%XB^n9XZXkDWPHFxM#;(Ncp8~MW=2d7;#Fg|1m>!0UQO&Hb%53R)+#HHxMV~Bxb~e2)&Hpb3UiNJ$-`DvKbIPId%$^Vt!dbd@@ zb(wLT5jv*&s>Z&K@!ShTyys8nMlu~#VhC;So@@;?H5-U!f!HZEFF7MOu_(J(KQ}Qm zPoX@sBtxONATc?$STE(Y@0l~*s9y07JaJUy%=VxQmoFbznz%;b@ad%tlYCBjp3&}L z7p#)p6SF5~g;Lm_7$j>^f(mG*F~j7I0xFZO1q3JxGe#y6U|zy3<{20`fubP5$e;kG z85s1EQ%aIbGjmb`ypgrZMwlSVen@B|^evq%z$X?3Gape8fJ7hwV*XuVp4KZU%Fjwo zE(x ziOKi*9U03eD+-u{Gf%XDv=uuqN)}yn7lzieewog7B%du#Zgoj z@J_zKBRP2;FNX>!6429?22?S`ol8NAHS1Ag99#ARX@clb;X}!6$Z?4+=O8pT0yW~u mM@Ep0glrbNvyD-l{hbe%ImCfZXJrFP3IgGBVB%=x2k`(u67?tm delta 1614 zcmdm|@mf(Lz?+#xgnxX@CSIabEL_MHPkXOFr@M@FyPX$ zc`uU^qZ&KMB3agh{EQ3?OMvQesh#|l`Hd<&N6x|6nRkFzJ_0Jop>*;$7TwTCPfwlE z4m{y|=FDY{)8~CIK6$$8+0#cl8cbcwGBs46s-$UTMlri~1$ldQe-hzYW7#MZw=OD9 z4`?Pk$ILw4N*|yden1Sdg8}GSAFt5OrK}Q6%s|HE3G8)XT9D%%ACPZyeX755AJ9p^ znJ4pd8rKJUKQRzEK415X^`HLOwM9$h?%aNKYTnh!!Y-Eb@0KduRmnZPbmpWbr|N#s zF1yKETf`sib^6R7qyJ}o(l(!u%``gPuNV~Ws;r%DzUZRgZ>_A>TM=^~&w8NYq%FL^ z;EVctlbIqKtdD;wvW56HwpskWKF{h%7<;crish456>e4W`WpsS8{~RID^~7Vc`b~6 ziRZ^ZUv^g8}tGvhu)fAVY*RQ@R!%Cf;i#5Tb~Fmp3}a1w``q&uW+nQ z{C%5$;_KDwbdLL~MjNc^xo$M+{sL*I6z}`DdH)#5ZBg5AyQh$siFe-ihRz937MZ_R zd^JIh{bc-u3q?y$Ui3O$KdoS^uug805=XAW(A zS+dpQTxR8*)th-f2d}euw%RymUwQ6M&BuRj_iq>I7g#TUYX8}qpLOSJIqRg<(w$C= z=UqQ`H3^qR zeTx1|A~bf^A80geF5NWu*yJx^>#T(*q+fk}`1~tI`ROY*Z~Ak^`*oJh?HkuPnnTp4 za4EmO`?TNom8pR5f>$43{rXpLV0-YGb&U5_r6pUp-CN;N*KOB&Vq)TpZ67j2wkz%r z&WUYyI9bengTqy?YPa9T7Mp6{Gfe+?c+Hbt+mppP{r9%VSHx!2&zCp4e{<{oIgt;R ztvWFKSEJ!ShKwmqJAU(AtZDplw4b4gdG@^)1!-lg$FpweS^Ae6#$RRqQ5+|p{P(u^ z&P@#0MJ+57jr-No9$J*_ijtYW#YXRIWaCfG-|atN@rdgO@7~q<@!PcXyhm)0e4hQI z{EWDMwVck6w7I;x`+xo|`B%g?q4oW;KkSpscxE&21!gP}UNz=JK-!kqbn<&4wt84G zgIt_&!iyXjLoYd{B&jqrCndm}kx7IBQ92=)EZi{FV0sI%tO02&D9X=DO)f##2rXwO za|rOdK=l1#25P{e8o9&}La~OAm4P8QF*9$nppb~F2v7=KkeF~zk`aCdOoI(93=G0h z4U7y5K-R3ulLV9$KxK;Vg;GsW5%d~}MS&OuAZoU%KKZo(54aHeB_PdY#xYre zLwvHHAP-nCqC8??(1vJ*>Q(2QEXb*=4f8L|LGVlg^d-odAONxK-{eh#j!av4CLiS0 zoGd5A3yvl|A!$a}$zDQI3c$!RfhdQNN^p(OdRT@q%~& DZoWFi diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/testFileWithNoExtension.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/testFileWithNoExtension/testFileWithNoExtension.zip index 4009a7475428a22f20131fd9369681faad039c59..8af4f6c6f2146babe5cacfcb1f8e699dc1cbf994 100644 GIT binary patch delta 453 zcmdlby;6EZH7BoAR)mSi^G_3!7#SE?CU3X;U&Q+wsF}c zTO+QnQvwSOGA%4!ZW5EHDy?bN$~9H1-8tuCvhR1Lx4iGv3|S@lmFwnz>!|&gI)km*Q;K1) zTjm9+f5%@Z-8%Qu+;J0UgHO}vMPfmo!52?jmwsNP9#V5>s(gSqGYc032y6oeKbQd} jxEVGZaWgZaMT--!DKk*zVtf}4?Bq1NS~;e$jlbGsZpUFw(27@ zYv7j$OBG(eGmG^3HuZ17ulKc{8IJyPJ{+9J`DJP8#!`RZPgPTnIp&Zn*`qT%O<5~< zt9El(#7wv6JJce$E}Uwqo%ip#w(l<%uY)&AdE}OcE|B>3e(GYeh1cSg1x#%|c}{Ac z^p&TCXIlM56R!D7jh}A1D3=+uXa7Et^%nCICqDV!&wOI!`|VlOwU*UuS7cXpef-(C^ZDF51LLEyferat*XwN_moZPBBH+JV;Hu;i zX?YnI=G9@<@nKOWx55_AGxYDyv58N4aQ&y!>o4`wHyJU%Hj|B^x#fEn z-c$*9mps;fhws>D<(NOq*ka%R_;KRA>=EN5*XRFXf8KpR`<>Pf(`!Fw{lA?1-CpX+ zgTs<_%mLoaEL;pA@SG_mbh8k*5EEL=81kAjKMx6=oXIP#D#p#g;FOw|oROPYlwGVJ V;LXYg(#i#dsZ0zE_CRR{1_17k&ffq4 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java index df36c031221..b8193aee547 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java @@ -1,65 +1,67 @@ -/******************************************************************************* - * Copyright (c) 2004, 2005 IBM 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: - * IBM - Initial API and implementation - *******************************************************************************/ -package org.eclipse.cdt.managedbuilder.tests.suite; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.cdt.core.CCorePlugin; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests20; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests_SharedToolOptions; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildEnvironmentTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildMacrosTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildTCSupportedTest; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedCommandLineGeneratorTest; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject21MakefileTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject30MakefileTests; -import org.eclipse.cdt.managedbuilder.core.tests.ManagedProjectUpdateTests; -import org.eclipse.cdt.managedbuilder.core.tests.MultiVersionSupportTests; -import org.eclipse.cdt.managedbuilder.core.tests.OptionEnablementTests; -import org.eclipse.cdt.managedbuilder.core.tests.ResourceBuildCoreTests; - -/** - * - */ -public class AllManagedBuildTests { - public static void main(String[] args) { - CCorePlugin.getDefault().getCoreModel().getIndexManager().reset(); - junit.textui.TestRunner.run(AllManagedBuildTests.suite()); - } - public static Test suite() { - // May/2005 Turning off all indexing for now because the "original" indexer causes hangs... - CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, CCorePlugin.NULL_INDEXER_UNIQUE_ID); - // We could enable this later... - //CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, "org.eclipse.cdt.core.domsourceindexer"); - - TestSuite suite = new TestSuite( - "Test for org.eclipse.cdt.managedbuild.core.tests"); - //$JUnit-BEGIN$ -// TODO uncoment this - suite.addTest(ManagedBuildCoreTests20.suite()); - suite.addTest(ManagedBuildCoreTests.suite()); - suite.addTest(ManagedProjectUpdateTests.suite()); - suite.addTest(ManagedCommandLineGeneratorTest.suite()); - suite.addTest(ResourceBuildCoreTests.suite()); - suite.addTest(ManagedProject21MakefileTests.suite()); - suite.addTest(ManagedProject30MakefileTests.suite()); - suite.addTest(ManagedBuildCoreTests_SharedToolOptions.suite()); - suite.addTest(ManagedBuildEnvironmentTests.suite()); - suite.addTest(ManagedBuildMacrosTests.suite()); - suite.addTest(ManagedBuildTCSupportedTest.suite()); - suite.addTest(MultiVersionSupportTests.suite()); - suite.addTest(OptionEnablementTests.suite()); - //$JUnit-END$ - return suite; - } -} +/******************************************************************************* + * Copyright (c) 2004, 2005 IBM 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: + * IBM - Initial API and implementation + *******************************************************************************/ +package org.eclipse.cdt.managedbuilder.tests.suite; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.cdt.core.CCorePlugin; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests20; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildCoreTests_SharedToolOptions; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildEnvironmentTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildMacrosTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildDependencyCalculatorTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedBuildTCSupportedTest; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedCommandLineGeneratorTest; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject21MakefileTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedProject30MakefileTests; +import org.eclipse.cdt.managedbuilder.core.tests.ManagedProjectUpdateTests; +import org.eclipse.cdt.managedbuilder.core.tests.MultiVersionSupportTests; +import org.eclipse.cdt.managedbuilder.core.tests.OptionEnablementTests; +import org.eclipse.cdt.managedbuilder.core.tests.ResourceBuildCoreTests; + +/** + * + */ +public class AllManagedBuildTests { + public static void main(String[] args) { + CCorePlugin.getDefault().getCoreModel().getIndexManager().reset(); + junit.textui.TestRunner.run(AllManagedBuildTests.suite()); + } + public static Test suite() { + // May/2005 Turning off all indexing for now because the "original" indexer causes hangs... + CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, CCorePlugin.NULL_INDEXER_UNIQUE_ID); + // We could enable this later... + //CCorePlugin.getDefault().getPluginPreferences().setValue(CCorePlugin.PREF_INDEXER, "org.eclipse.cdt.core.domsourceindexer"); + + TestSuite suite = new TestSuite( + "Test for org.eclipse.cdt.managedbuild.core.tests"); + //$JUnit-BEGIN$ +// TODO uncoment this + suite.addTest(ManagedBuildCoreTests20.suite()); + suite.addTest(ManagedBuildCoreTests.suite()); + suite.addTest(ManagedProjectUpdateTests.suite()); + suite.addTest(ManagedCommandLineGeneratorTest.suite()); + suite.addTest(ResourceBuildCoreTests.suite()); + suite.addTest(ManagedProject21MakefileTests.suite()); + suite.addTest(ManagedProject30MakefileTests.suite()); + suite.addTest(ManagedBuildCoreTests_SharedToolOptions.suite()); + suite.addTest(ManagedBuildEnvironmentTests.suite()); + suite.addTest(ManagedBuildMacrosTests.suite()); + suite.addTest(ManagedBuildTCSupportedTest.suite()); + suite.addTest(MultiVersionSupportTests.suite()); + suite.addTest(OptionEnablementTests.suite()); + suite.addTest(ManagedBuildDependencyCalculatorTests.suite()); + //$JUnit-END$ + return suite; + } +} diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java new file mode 100755 index 00000000000..9dca2b35ef4 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java @@ -0,0 +1,240 @@ +/******************************************************************************* + * Copyright (c) 2006 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 + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Intel Corporation - Initial API and implementation + *******************************************************************************/ + +/********************************************************************** + * These tests are for the default dependency calculators + **********************************************************************/ + +package org.eclipse.cdt.managedbuilder.core.tests; + +import java.io.File; +import java.io.FileFilter; +import java.util.ArrayList; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo; +import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; +import org.eclipse.cdt.managedbuilder.projectconverter.UpdateManagedProjectManager; +import org.eclipse.cdt.managedbuilder.testplugin.CTestPlugin; +import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.Path; +import org.eclipse.ui.dialogs.IOverwriteQuery; + +public class ManagedBuildDependencyCalculatorTests extends TestCase { + + public ManagedBuildDependencyCalculatorTests(String name) { + super(name); + } + + public static Test suite() { + TestSuite suite = new TestSuite(ManagedBuildDependencyCalculatorTests.class.getName()); + + suite.addTest(new ManagedBuildDependencyCalculatorTests("test1DepCalc2")); + suite.addTest(new ManagedBuildDependencyCalculatorTests("test1DepCalc3")); + suite.addTest(new ManagedBuildDependencyCalculatorTests("test1DepCalcPreBuild")); + return suite; + } + + private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){ + ArrayList projectList = null; + if (containsZip) { + File testDir = CTestPlugin.getFileInPlugin(new Path("resources/depCalcProjects/" + projName)); + if(testDir == null) { + fail("Test project directory " + projName + " is missing."); + return null; + } + + File projectZips[] = testDir.listFiles(new FileFilter(){ + public boolean accept(File pathname){ + if(pathname.isDirectory()) + return false; + return true; + } + }); + + projectList = new ArrayList(projectZips.length); + for(int i = 0; i < projectZips.length; i++){ + try{ + String projectName = projectZips[i].getName(); + if(!projectName.endsWith(".zip")) + continue; + + projectName = projectName.substring(0,projectName.length()-".zip".length()); + if(projectName.length() == 0) + continue; + IProject project = ManagedBuildTestHelper.createProject(projectName, projectZips[i], location, projectTypeId); + if(project != null) + projectList.add(project); + } + catch(Exception e){ + } + } + if(projectList.size() == 0) { + fail("No projects found in test project directory " + testDir.getName() + ". The .zip file may be missing or corrupt."); + return null; + } + } else { + try{ + IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId); + if(project != null) + projectList = new ArrayList(1); + projectList.add(project); + } catch(Exception e){} + } + + return (IProject[])projectList.toArray(new IProject[projectList.size()]); + } + + private IProject[] createProjects(String projName, IPath location, String projectTypeId, boolean containsZip) { + + // In case the projects need to be updated... + IOverwriteQuery queryALL = new IOverwriteQuery(){ + public String queryOverwrite(String file) { + return ALL; + }}; + IOverwriteQuery queryNOALL = new IOverwriteQuery(){ + public String queryOverwrite(String file) { + return NO_ALL; + }}; + + UpdateManagedProjectManager.setBackupFileOverwriteQuery(queryALL); + UpdateManagedProjectManager.setUpdateProjectQuery(queryALL); + + IProject projects[] = createProject(projName, location, projectTypeId, containsZip); + return projects; + } + + private void buildProjectsWorker(IProject projects[], IPath[] files, boolean compareBenchmark) { + if(projects == null || projects.length == 0) + return; + + boolean succeeded = true; + for (int i = 0; i < projects.length; i++){ + IProject curProject = projects[i]; + + IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(curProject); + + //check whether the managed build info is converted + boolean isCompatible = UpdateManagedProjectManager.isCompatibleProject(info); + assertTrue(isCompatible); + + if (isCompatible){ + // Build the project in order to generate the makefiles + try{ + curProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null); + } + catch(CoreException e){ + fail(e.getStatus().getMessage()); + } + catch(OperationCanceledException e){ + fail("the project \"" + curProject.getName() + "\" build was cancelled, exception message: " + e.getMessage()); + } + + //compare the generated makefiles to their benchmarks + if (files != null && files.length > 0) { + if (i == 0) { + String configName = info.getDefaultConfiguration().getName(); + IPath buildDir = Path.fromOSString(configName); + if (compareBenchmark) + succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files); + else + succeeded = ManagedBuildTestHelper.verifyFilesDoNotExist(curProject, buildDir, files); + } + } + } + } + + if (succeeded) { // Otherwise leave the projects around for comparison + for (int i = 0; i < projects.length; i++) + ManagedBuildTestHelper.removeProject(projects[i].getName()); + } + } + + // Build projects and compare benchmarks + private void buildProjects(IProject projects[], IPath[] files) { + buildProjectsWorker(projects, files, true); + } + + + /* (non-Javadoc) + * test for dependency calculation as a side-effect of compilation + */ + public void test1DepCalc2(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk"), + // This file is different using Cygwin vs GCC + //Path.fromOSString("main.d"), + Path.fromOSString("Sources/subdir.mk"), + Path.fromOSString("Sources/func1.d"), + Path.fromOSString("Sources/func2.d"), + Path.fromOSString("Sources/func4.d"), + Path.fromOSString("Sources/sub sources/func 3.d"), + Path.fromOSString("Sources/sub sources/subdir.mk")}; + IProject[] projects = createProjects("test1DepCalc2", null, null, true); + buildProjects(projects, makefiles); + } + + + /* (non-Javadoc) + * test for dependency calculation using Echo, a 2nd conmpilation step, and post-processing + */ + public void test1DepCalc3(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk"), + // This file is different using Cygwin vs GCC + //Path.fromOSString("main.d"), + Path.fromOSString("Sources/subdir.mk"), + Path.fromOSString("Sources/func1.d"), + Path.fromOSString("Sources/func2.d"), + Path.fromOSString("Sources/func4.d"), + Path.fromOSString("Sources/sub sources/func 3.d"), + Path.fromOSString("Sources/sub sources/subdir.mk")}; + IProject[] projects = createProjects("test1DepCalc3", null, null, true); + buildProjects(projects, makefiles); + } + + + /* (non-Javadoc) + * test for dependency calculation that uses a separate, pre-build, step to generate dependency files + */ + public void test1DepCalcPreBuild(){ + IPath[] makefiles = { + Path.fromOSString("makefile"), + Path.fromOSString("objects.mk"), + Path.fromOSString("sources.mk"), + Path.fromOSString("subdir.mk"), + // This file is different using Cygwin vs GCC + //Path.fromOSString("main.d"), + Path.fromOSString("Sources/subdir.mk"), + Path.fromOSString("Sources/func1.d"), + Path.fromOSString("Sources/func2.d"), + Path.fromOSString("Sources/func4.d"), + Path.fromOSString("Sources/sub sources/func 3.d"), + Path.fromOSString("Sources/sub sources/subdir.mk")}; + IProject[] projects = createProjects("test1DepCalcPreBuild", null, null, true); + buildProjects(projects, makefiles); + } + +} \ No newline at end of file diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java index 84e4a7eb15a..76a39889f96 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject30MakefileTests.java @@ -614,7 +614,10 @@ public class ManagedProject30MakefileTests extends TestCase { Path.fromOSString("makefile"), Path.fromOSString("objects.mk"), Path.fromOSString("sources.mk"), - Path.fromOSString("subdir.mk")}; + Path.fromOSString("subdir.mk"), + Path.fromOSString("main with spaces.d"), + Path.fromOSString("sub folder with spaces/subdir.mk"), + Path.fromOSString("sub folder with spaces/foo with spaces.d")}; IProject[] projects = createProjects("test with spaces", null, null, true); buildProjects(projects, makefiles); }