mirror of
https://github.com/git/git
synced 2024-10-30 13:20:15 +00:00
99e37c2560
Use 'test_atexit' to run cleanup commands to stop 'p4d' at the end of
the test script or upon interrupt or failure, as it is shorter,
simpler, and more robust than registering such cleanup commands in the
trap on EXIT in the test scripts.
Note that one of the test scripts, 't9801-git-p4-branch.sh', stops and
then re-starts 'p4d' twice in the middle of the script; take care that
the cleanup functions to stop 'p4d' are only registered once.
Note also that 'git p4' tests invoke different functions in the trap
on EXIT ('cleanup') and in the last test before 'test_done'
('kill_p4d'). Register both of these functions with 'test_atexit' for
now, and a a later patch in this series will then clean up the
redundancy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
86 lines
2.2 KiB
Bash
Executable file
86 lines
2.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 relative chdir'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot' '
|
|
(
|
|
cd "$cli" &&
|
|
echo file1 >file1 &&
|
|
p4 add file1 &&
|
|
p4 submit -d "change 1"
|
|
)
|
|
'
|
|
|
|
# P4 reads from P4CONFIG file to find its server params, if the
|
|
# environment variable is set
|
|
test_expect_success 'P4CONFIG and absolute dir clone' '
|
|
printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
|
|
test_when_finished "rm p4config" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CONFIG=p4config && export P4CONFIG &&
|
|
sane_unset P4PORT P4CLIENT &&
|
|
git p4 clone --verbose --dest="$git" //depot
|
|
)
|
|
'
|
|
|
|
# same thing, but with relative directory name, note missing $ on --dest
|
|
test_expect_success 'P4CONFIG and relative dir clone' '
|
|
printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config &&
|
|
test_when_finished "rm p4config" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CONFIG=p4config && export P4CONFIG &&
|
|
sane_unset P4PORT P4CLIENT &&
|
|
git p4 clone --verbose --dest="git" //depot
|
|
)
|
|
'
|
|
|
|
# Common setup using .p4config to set P4CLIENT and P4PORT breaks
|
|
# if clone destination is relative. Make sure that chdir() expands
|
|
# the relative path in --dest to absolute.
|
|
test_expect_success 'p4 client root would be relative due to clone --dest' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
echo P4PORT=$P4PORT >git/.p4config &&
|
|
P4CONFIG=.p4config &&
|
|
export P4CONFIG &&
|
|
unset P4PORT &&
|
|
git p4 clone --dest="git" //depot
|
|
)
|
|
'
|
|
|
|
# When the p4 client Root is a symlink, make sure chdir() does not use
|
|
# getcwd() to convert it to a physical path.
|
|
test_expect_success SYMLINKS 'p4 client root symlink should stay symbolic' '
|
|
physical="$TRASH_DIRECTORY/physical" &&
|
|
symbolic="$TRASH_DIRECTORY/symbolic" &&
|
|
test_when_finished "rm -rf \"$physical\"" &&
|
|
test_when_finished "rm \"$symbolic\"" &&
|
|
mkdir -p "$physical" &&
|
|
ln -s "$physical" "$symbolic" &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
P4CLIENT=client-sym &&
|
|
p4 client -i <<-EOF &&
|
|
Client: $P4CLIENT
|
|
Description: $P4CLIENT
|
|
Root: $symbolic
|
|
LineEnd: unix
|
|
View: //depot/... //$P4CLIENT/...
|
|
EOF
|
|
git p4 clone --dest="$git" //depot &&
|
|
cd "$git" &&
|
|
test_commit file2 &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
git p4 submit
|
|
)
|
|
'
|
|
|
|
test_done
|