Re: [PATCH] t/test-lib: print pretty msg when git isn't built
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 18, 2012, 20:52 UTC
- Message-ID
- <7va9wnkq9u.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1347901579-5545-2-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> When tests were run without building git, the following error message > was displayed: > > .: 54: Can't open /path/to/git/source/t/../GIT-BUILD-OPTIONS
Does the test stop due to this error, or it just goes on and hit another error? I am guessing that it is the latter, and if that is the case, a more important change to describe here is
> Change this to display a more user-friendly error message: > > error: you do not seem to have built git yet.
... "and stop the execution."
Show 43 quoted lines
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> > --- > t/t0000-basic.sh | 10 ---------- > t/test-lib.sh | 6 ++++++ > 2 files changed, 6 insertions(+), 10 deletions(-) > > 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 > > ################################################################ > diff --git a/t/test-lib.sh b/t/test-lib.sh > index f8e3733..c00452a 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -51,6 +51,12 @@ then > fi > GIT_BUILD_DIR="$TEST_DIRECTORY"/.. > > +if ! test -r "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS > +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