git p4: use "git p4" directly in tests

Drop the $GITP4 variable that was used to specify the script in
contrib/fast-import/.  The command is called "git p4" now, not
"git-p4".

Note that configuration variables will remain in a section called
"git-p4".

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff
2012-04-08 20:18:02 -04:00
committed by Junio C Hamano
parent 9dcb9f24f8
commit 6ab1d76c3c
12 changed files with 182 additions and 184 deletions

View File

@ -1,20 +1,18 @@
#
# Library code for git-p4 tests
# Library code for git p4 tests
#
. ./test-lib.sh
if ! test_have_prereq PYTHON; then
skip_all='skipping git-p4 tests; python not available'
skip_all='skipping git p4 tests; python not available'
test_done
fi
( p4 -h && p4d -h ) >/dev/null 2>&1 || {
skip_all='skipping git-p4 tests; no p4 or p4d'
skip_all='skipping git p4 tests; no p4 or p4d'
test_done
}
GITP4="$GIT_BUILD_DIR/git-p4"
# Try to pick a unique port: guess a large number, then hope
# no more than one of each test is running.
#