Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > Hi Junio, > > Junio C Hamano wrote: >> Is this a sufficient replacement for what you removed from 0000? >> Can the BUILD-OPTIONS file exist when your build of git failed? > > Oops, I didn't realize that BUILD-OPTIONS would be written when the > build fails. How about something like this instead: Yeah, but why change it so much? Wouldn't writing "$GIT_BUILD_DIR/git" >/dev/null if test $? != 1 then : You haven't built git! fi just like the original in 0000 be sufficient?? > diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh > index ae6a3f0..08677df 100755 > --- a/t/t0000-basic.sh > +++ b/t/t0000-basic.sh > @@ -18,16 +18,6 @@ swapping compression and hashing order, the person > who is making the > modification *should* take notice and update the test vectors here. > ' > > -################################################################ > -# It appears that people try to run tests without building... > - > -../git >/dev/null > -if test $? != 1 > -then > - echo >&2 'You do not seem to have built git yet.' > - exit 1 > -fi > - > . ./test-lib.sh > > ################################################################ > Modified t/test-lib.sh > diff --git a/t/test-lib.sh b/t/test-lib.sh > index f8e3733..8cc7755 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -51,6 +51,12 @@ then > fi > GIT_BUILD_DIR="$TEST_DIRECTORY"/.. > > +if ! test -x "$GIT_BUILD_DIR"/git || "$GIT_BUILD_DIR"/git && test $? != 1 > +then > + echo 'error: you do not seem to have built git yet.' >&2 > + exit 1 > +fi > + > . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS > export PERL_PATH SHELL_PATH -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html