aboutsummaryrefslogtreecommitdiff
path: root/t/t9806-git-p4-options.sh
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2013-01-26 22:11:11 -0500
committerJunio C Hamano <gitster@pobox.com>2013-01-26 22:00:39 -0800
commitcfa96496bd9e7828c5626e2cd1353e9fb7d3d0c7 (patch)
tree2578dd8939ae020b1ac1f10ceae3dd0858babd9e /t/t9806-git-p4-options.sh
parent6492a1041a66f19589f6001400005a3913884882 (diff)
downloadgit-cfa96496bd9e7828c5626e2cd1353e9fb7d3d0c7.tar.gz
git-cfa96496bd9e7828c5626e2cd1353e9fb7d3d0c7.tar.xz
git p4 test: translate windows paths for cygwin
Native windows binaries do not understand posix-like path mapping offered by cygwin. Convert paths to native using "cygpath --windows" before presenting them to p4d. This is done using the AltRoots mechanism of p4. Both the posix and windows forms are put in the client specification, allowing p4 to find its location by native path even though the environment reports a different PWD. Shell operations in tests will use the normal form of $cli, which will look like a posix path in cygwin, while p4 will use AltRoots to match against the windows form of the working directory. This mechanism also handles the symlink issue that was fixed in 23bd0c9 (git p4 test: use real_path to resolve p4 client symlinks, 2012-06-27). Now that every p4 client view has an AltRoots with the real_path in it, explicitly calculating the real_path elsewhere is not necessary. Thanks-to: Sebastian Schuberth <sschuberth@gmail.com> Thanks-to: Johannes Sixt <j6t@kdbg.org> fixup! git p4 test: translate windows paths for cygwin Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9806-git-p4-options.sh')
-rwxr-xr-xt/t9806-git-p4-options.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 564fc80d9..254d428b7 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -215,7 +215,7 @@ test_expect_success 'clone --use-client-spec' '
test_must_fail git p4 clone --dest="$git" --use-client-spec
) &&
# build a different client
- cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") &&
+ cli2="$TRASH_DIRECTORY/cli2" &&
mkdir -p "$cli2" &&
test_when_finished "rmdir \"$cli2\"" &&
test_when_finished cleanup_git &&