From 166adf40295641204592fbb97f5e2d6b5dbe806e Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 8 Jun 2010 16:07:20 -0600 Subject: [PATCH] Update retest w/ better handling of multi-statement shell commands; update tdeps1_rt to use it --HG-- extra : rebase_source : 010907d47b360288825cb9c841d62450700be225 --- inttest/retest | Bin 16802 -> 16953 bytes inttest/tdeps1/tdeps1_rt.erl | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/inttest/retest b/inttest/retest index 7f8012c7f5da3d8494a0308458bd9e377332823d..85c9f1e70ccb1a885dc294b19f5e995980470259 100755 GIT binary patch delta 2073 zcmV+!2qg8{jO0kF$5fA)CDJY57Z0JsML0CWog01f~E0CHt?Wpi|2b7(GNWnpb? zR&8wC#u?`6D2b-cgccQl#ZG9G`Lb+_w&W;wmgFSOX4`zZ@j74|R+%PgTd__N4pPTDT)AT3S{UyZy34_#gY}>x;0p{4e7_Q0U4Gbf5Ez}SqBu@2bR4@ z(W!t=z(d_V_rC8v_uPrP>7&O+8K$*Tn93i{`|b+Epl>n^Gv4CazFqT6wI%G;owl%7 z_sf-9e9`tx=1B`%Wv`{`xz$R!=GR&%d%~#HZEQOyBAy+0+!ez&mttkNR4LEL7F-Yd z(I7a!P%(VpcA`e@f0Sc#G6$#hp% z49DU;+ptR2vc+14Z?xL0WmvFp`1KmL-AbJ1S8Xe5d!FmHe*~iy*R2Yn87r<;uh>z` zp06+RAy;u1F@Q5nGl-3Q_6ggo*{ux;0T&HyX>FvJ%Fcqjks8p{?-*W}p4NsdruwLs z9v#+(i>_reOsp67M`RkGvw$K%Kw=~@AR~DLkqK6bl#MeC$w~w(1WWtsNTX>V0X3st#C!3@PQtfO@rg$e z2~&tJ!|2>T8_f_tiP0QUB~%r!%hNK}`AxbsEi3vHIy$mq;5!jk0=w80gZG$ zBs3r{z5->Vq9BXt`U4o@4G6K7!3VoFG6_#RTk5DigDD9>$z6xc(qBTVUpl+GZfp;PEoASHv3$k!3q zNi(`2LlqI%-6m3J5ZBWwY=O)^$n3-N`YM4?fKcRu0<$Y(Q4{(ydow~G_`FTn%x@QZ z5w{tliV#(l3q@wOP!!FS&^OEPfTzT6B4*$(f7jdSigPp5GHk<6y%=osE?o+S`?`c4 z#BJ%O&#fSC5X8yr;`%#3eMg%n zf48$lO2UCe+|Ev61k?_L+TmukL!fr3S?v&2I~1th1!@Now+o^`?a;c~VM+Z&EtzHi zk6`*^Vw3A<7f!@rN=Ow^BbOxcS&fN{cSTJMY)|T#NR5-13d@J<+Xd^>fF25IS%WhT z6V2Usrg@U#E@3C)M!M-U4K9oVr?n9ce_T+KL{bUPB5t%(*aJr7z=&M45jij-*K9YT41>76B!Q2JTsz`ELm4=0`{0#HNtsI^Za_TJNDWM?o z$;QDx0Cfpba15G=%V&lC7?c(sf53Rw_dZAe7#>`y((l^<34j4?_@5DD==-a|wE!X^ zS^;fgTL5eTpfFwxc^uZG?M^^fQ@cB?PurWD_`a~t7Qoi9z0R-4D`EUFU?iM}YS6;? zb)7hj&ouwDzm0W#tEzOYR{djSJsoen^M(|YD>#`0?U{&H@bnDu`!keB7=2W!I_QCs28riI*L-Qnzf{kGXXp zuB6KhYtNS*i=p?lX}af>g6mt&Vm5~TlZNM%oyFSmpentdLD^*{njP6aGEO8@q!kYHr;#?PX>({YVWG(^mPh$4*)4nrEh~_4!KKOgAoq0dxNf zJpxzP;|!CZule*~{SUJaIu8d9_ISuVT?8-yxCa0LbPJO!K}-UUI+J-pBL?w500000 D#T5RD delta 1945 zcmV;K2WI%WgaM+10kF$5f5k?}JakMj2q6am0JI7K01f~E0CHt?Wpi|2b7(GNWnpb? zR$pw}#u-2AD3PYkw zn3pX>UWyeP1`OC9x;7mKbPpXc6vO^tT^FEOw*f&hVE-_z-O`rVdD{bif5-6}9Y2VYR`{IP6ltVQ-*=N+mK!>J6m%W2ZS6XZz}ZRwp-wmA z!^rPo04DqpH`}&I`wh!=6aH?>+3Pq>fH$nGeA_`N z`778Pf_lF@U{8R_97&|7R8Aez)M4Jh8AB-u2pI*%z;>`y zL`o9*IN|o6!rTiG>jdIn970GyF9O@DAx+>kQn=S(WK!kc05MY9``mrn)wp+iD?Y;2 zNAZd}tX3;N(xp+OhEtkc*dU84sGjx1OeT@^-bcO;m zP7+Sce+&`23!FGICXd6+EX>Se^&mNLCV<=|Cr$tg$mJ+GvQd&=B)zoQ`mJ|d08vQL=UP~w6Ur&)NG-!$Z>fqRCzRSilR7BUW% z>0e|vE9W`!^f-M!1}e;huQ+6AphBL0=mxHE;+Zj72O-KJM7dvxG6+%b7otpsD91v~ zfe;IvI0q;YqTF9oWu*e;(_vyX`Faz?f7sBOAnS)b;p5NbVIKwU-9>pG7O#A|cu}q> zl14O*?P)%3K+f|TV3x340ScO2k``o0r$jWwP<)KiSmX*$!k1@o;=%!^|1D{XFK6X5 zoT!h}X9W%t@hk{cMx1!gNaIW7Lr(k*bwH_|H?Tr|stBD$a8}@5Jug3wSFi$te=R9h zFm+V{!4y&h2WYcYGeDc&Pm1!=?kCdd5P{pB(q8VRU6hvj_a4D5Jcobf)q%J7eY6&VM*?i|CH*f?f*y)O=J zC+d4~UN)ErR%YYpS)2aOf#p~nn)@V+cZ9VQEYA}RPxH^RI074w?LsS}YkeE+M|Ps)x-+JQS_Jx&pL3(-n*#7at ze@>IH-+eu8K78=S+y`&{Dbx6QZUk4lUBo+^Ezd^u;?oVhMtmO%ZFH3NZ&-oX^0vdBI4ZsGRY2HXl&s93n?Fl^ zeAH??*HW9XRe!NkmS7#R&RM78B|^U&G@V_vP`VPr#FE{*dGk5D6b8*wr@QI4nx)>& zD)t;+LFeJ3xP#EjW*E_8_%BdP0|b-mK^n8eI`IY$#YV?GbWAV^AqM~ev=@c003G)00000$MCt0 diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl index 8005741..5b531bc 100644 --- a/inttest/tdeps1/tdeps1_rt.erl +++ b/inttest/tdeps1/tdeps1_rt.erl @@ -14,7 +14,7 @@ files() -> {copy, "../../rebar", "rebar"}, %% B application - {create, "repo/b/ebin/b.app", app(b)}, + {create, "repo/b/src/b.app.src", app(b)}, {copy, "b.rebar.config", "repo/b/rebar.config"}, {copy, "b.hrl", "repo/b/include/b.hrl"}, @@ -26,11 +26,12 @@ files() -> run(_Dir) -> %% Initialize the b/c apps as mercurial repos so that dependencies pull %% properly - HgCmd = "hg init && hg add && hg commit -m 'Initial commit'", - retest_log:log(debug, "~s\n", [os:cmd("(cd repo/b && " ++ HgCmd ++ ")")]), - retest_log:log(debug, "~s\n", [os:cmd("(cd repo/c && " ++ HgCmd ++ ")")]), + HgCmd = "/bin/sh -c \"hg init && hg add && hg commit -m 'Initial commit'\"", + {ok, _} = retest_sh:run(HgCmd, [{dir, "repo/b"}]), + {ok, _} = retest_sh:run(HgCmd, [{dir, "repo/c"}]), - retest_log:log(debug, "~s\n", [os:cmd("./rebar get-deps compile")]), + + {ok, _} = retest_sh:run("./rebar -v get-deps compile", []), ok.