diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-04-08 20:18:02 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-09 15:00:33 -0700 |
| commit | 6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1 (patch) | |
| tree | 7186f5babb7ccf2713c9baf24fa897204c654d27 /t/lib-git-p4.sh | |
| parent | 9dcb9f24f8f97c5d0d3224791506161dfeac5a69 (diff) | |
| download | git-6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1.tar.gz | |
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>
Diffstat (limited to 't/lib-git-p4.sh')
| -rw-r--r-- | t/lib-git-p4.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 49edaaec07..b90986c2c9 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -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. # |