From a3a513fffb6b3a46def97c2d0a09857336891994 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 30 Mar 2012 18:13:35 -0400 Subject: [PATCH] Add some missing Autotools test fixes done after initial move. - fix some findBugs issues with ProjectTools.java - make the configure script executable to support using sh -c to invoke the script --- .../org.eclipse.cdt.autotools.tests/ChangeLog | 9 ++++++ .../cdt/autotools/tests/ProjectTools.java | 26 +++++++++--------- .../zip/project2.zip | Bin 95172 -> 95994 bytes 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.tests/ChangeLog b/build/org.eclipse.cdt.autotools.tests/ChangeLog index 7d06216d7ed..985943a50f9 100644 --- a/build/org.eclipse.cdt.autotools.tests/ChangeLog +++ b/build/org.eclipse.cdt.autotools.tests/ChangeLog @@ -1,3 +1,12 @@ +2012-03-30 Jeff Johnston + + * src/org/eclipse/cdt/autotools/tests/ProjectTools.java + (setup): Fix to return false when Workbench is null. + +2012-03-30 Jeff Johnston + + * zip/project2.zip: Fix autogen.sh to make the configure script executable. + 2012-03-29 Jeff Johnston * src/org/eclipse/cdt/autotools/tests/ProjectTools.java (build): Refresh the workspace root so resource tests diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java index a890eb0a676..579b684783e 100644 --- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java +++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/ProjectTools.java @@ -59,19 +59,19 @@ public class ProjectTools { */ public static boolean setup() throws Exception { if (!setupComplete) { - IWorkspaceDescription desc; - workspace = ResourcesPlugin.getWorkspace(); - root = workspace.getRoot(); - monitor = new NullProgressMonitor(); - if(workspace == null) { - return false; - } - if(root == null) { - return false; - } - desc = workspace.getDescription(); - desc.setAutoBuilding(false); - workspace.setDescription(desc); + IWorkspaceDescription desc; + workspace = ResourcesPlugin.getWorkspace(); + if (workspace == null) { + return false; + } + root = workspace.getRoot(); + monitor = new NullProgressMonitor(); + if (root == null) { + return false; + } + desc = workspace.getDescription(); + desc.setAutoBuilding(false); + workspace.setDescription(desc); } setupComplete = true; return true; diff --git a/build/org.eclipse.cdt.autotools.tests/zip/project2.zip b/build/org.eclipse.cdt.autotools.tests/zip/project2.zip index 98319d436e76647c6799a9f6888d808e0660b78b..6ebfb35f0329157e44a51ada565067b0a4362b9c 100644 GIT binary patch delta 2786 zcma)8drVVT96pCzo@yzSM{BQ06(g0c;26$2R2VXfKbabi6zCsfEbK!&W{!~=bP6}0g#u3 zK)e+6zyuKp5(H}WiHgk1%SI^#Akhzia6nQsiP%sUz@9}Uz%+I=fj3%}wtlUyR%@Cx zES*;dNl4OZCKy9+ErV0oVI2F);9WjN!*EDaoseX&+xy`XNPnb;;qyqa#(+XrnH#lo zUA?#0)Bul^ksw!7qs3LoHFa*n6hydl zJfU6UKNV(hA3!i_$^YsFJ_7oh0g6ziX#rApMs{65$6Q)(gnYC<$2NPKPf_+f+r4CA z*E;PYf&NkQ^hf~S&jKI<71ySkHIC}MDn63p%MlY@*Z`wMNEbI(JypJ%!fKU$nfw5s zx_t(R{P#?ZZ^#3Zvyth;)uoETh_cLqH~^lm2SCWI)^i?mlexm(Jnj%OjVq2CO2r}m zNo9qwPhZ@`rxx|#!_VzuFB*GHd`jZPi*o09ftEU-wpcux{$5A+7nxnG*uC)sc`$3L5m+xQD3Ma_Q`H;v<=NHXlovk z4(6O~?3dQ>soC)PGssTo_)rJ?zStQ8Id~Joh)dOgV-rL)+WVPB&BE#d7 zQLU-3(&iYd#X!oWBpttwd8WU|Gg*8ED(DwOOyrmzG9)(8ZpCb)WVuv4F}2kI11+3v+^GqCQagl5 zN7)#r^6VV3GpKn>6@z>LEJ;EDB%`!A$!_Z~1lWV;L~Fb z1oW|RgvJ)m6?g(=1dnBcmBEVwOf%=`dyxAwMdF~Z8lX7Tn@zVhD+(ZEkCGtN_VIU! zy99c*5sDeDc3Bga&^9BCP3274qrdU4&y4zdBS3dRG+l0jfiF+Of}MQl&s$X#Qb-tb zb0I?@F6+rHbU_1*nLr=TGfaKBtovJOX(Nm!U^;*GE9g~kcF2U2~xLoU&uHcZ5Q z7;#s6t8cd+yUsYU?7S7l={Y%W5#h^dl5Tv1=B4FSH#yP*z{)!i{R{H4KC#x_r)wMG zjLJy}#$P#J0++R02YoIeBngho$0G^%KzI!b4+L2QL3&BCGQS8pD#A`Q5j4go^Ts5M zv8xc)W5v$^ieK_%j0^(7K0z>sFHeFcXsaHIl-_c?txg1H`ZPjwcyxivKL7`dM&BKQ K0F)ZAIsFH@(t$w$ delta 2051 zcmZ{l4NOy46vyvvX#s(1Yg?$6Zw-rRDMJz=*aVS*sW>PU-4L}xX-lDnwqU_2s}o@} zMdhh)BgX6v88?u)IhDDv`&!%gShqAynw#@G_niMZ z|J(T)#@D|vYBHsCFD?MU2VARCCRVp*UgkppHqroC0(d}CVbZIVI+0N=&+!HH#@E}o z5MR033p|BS;TKuo6kioDyYyFd_wzePHXEwf^w!GMpVnp0(>uF5_bMzL zk2Bs;r=1V`xb3URfZeuOvGCcMg64t7?wZ)cwfoJil$N4LZKw8rFB%cQ2yI!@Gy1lC zBzaKN;E5FTXXFG_UH^m=3|KwL*R`jGa0&omrLEw)J;EJYNe}gn1(YljS+-Z_2VA>WzPN zJN}|GKBR}dd0rJI9Y1)=8RN#&{0Ym5qxYa_ld;{!rlDpmwt|k@M4wP&^8N<5d7G2Ryvo0Qp!o-;ZqZ zB)=tU>9OzLmtrgc*sC02*koNelc*X1dqDkJ7G7+EETm1;aER+zHf&;Hg$53d2e4pT zus>B3d#m9!9yWUcA-Ko{`D~=yRQ`fnH&&vy|H_f z?yJ0hG_vp>BP5P5pLQLeeRP_K?VBYIKbQ?8`{|ussKymq7_^cHwxw<-XI)Pb8T*VQ zjO2j=y{<^3sxT-;8l6K^azgm+o85$j%YL^zkvML4hBj<#xILx1pk6uSd$73)<7;#!-<3h{|D zC=iqPI4LcnQVU1Q!%pHpIBh z;sH2I^Rx-6qs=nzg%6cOzDGlz<{+sqOC%F7Gr$lJ>bW{MVX;?83e8M}A2h-cU$+eS zZW9#5QA6$}0f1g`!otRwQjO85(V@2jb@l-H!_CpLU5221lIyY@mQpzPBS35|Vx14b z;xQAI-sk3}jw44e>?d4Jrkk<+ya!)rf+3WFVKI^*7B$4@2tHtdVbqYmNot7ABK{H| zGr^UVe%p=z>UZ=8rS3vyS%JQ^?7#XgpACv9Z~xoEo}h4Un>t9V!=J8h9afKWqD~WJ zy#-$x-(z90i=3bs@*10^9>uz|J01bV5RU+56v+KcNv6xPEe{fJ!D^4?s6C)e%%csa ltfwRE`V#-xRO~=8-d72EE1a1bOrlsW`t&gXm@OsT_Ydz(N%;T(