diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:40:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-25 10:40:24 -0700 |
| commit | 86bdfa395559b8d99fbec9b8366524aaa311399b (patch) | |
| tree | 26b94060d8e1e79019a304dfe956f0ca61c3ebed | |
| parent | Merge branch 'js/hp-nonstop' (diff) | |
| parent | t/test-lib: make sure Git has already been built (diff) | |
| download | tgif-86bdfa395559b8d99fbec9b8366524aaa311399b.tar.xz | |
Merge branch 'rr/test-make-sure-we-have-git'
Only the first test t0000 in the test suite made sure we have built
Git to be tested; move the check to test-lib so that it applies to
all tests equally.
* rr/test-make-sure-we-have-git:
t/test-lib: make sure Git has already been built
| -rwxr-xr-x | t/t0000-basic.sh | 10 | ||||
| -rw-r--r-- | t/test-lib.sh | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index ae6a3f0777..08677df10e 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 aad46066ad..bff3d7570c 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -51,6 +51,15 @@ then fi GIT_BUILD_DIR="$TEST_DIRECTORY"/.. +################################################################ +# It appears that people try to run tests without building... +"$GIT_BUILD_DIR/git" >/dev/null +if test $? != 1 +then + echo >&2 'error: you do not seem to have built git yet.' + exit 1 +fi + . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS export PERL_PATH SHELL_PATH |