mirror of
https://github.com/git/git.git
synced 2024-05-23 12:36:09 +02: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>
40 lines
746 B
Bash
Executable File
40 lines
746 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 symlinked directories'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'symlinked directory' '
|
|
(
|
|
cd "$cli" &&
|
|
: >first_file.t &&
|
|
p4 add first_file.t &&
|
|
p4 submit -d "first change"
|
|
) &&
|
|
git p4 clone --dest "$git" //depot &&
|
|
(
|
|
cd "$git" &&
|
|
mkdir -p some/sub/directory &&
|
|
mkdir -p other/subdir2 &&
|
|
: > other/subdir2/file.t &&
|
|
(cd some/sub/directory && ln -s ../../../other/subdir2 .) &&
|
|
git add some other &&
|
|
git commit -m "symlinks" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
git p4 submit -v
|
|
) &&
|
|
(
|
|
cd "$cli" &&
|
|
p4 sync &&
|
|
test -L some/sub/directory/subdir2 &&
|
|
test_path_is_file some/sub/directory/subdir2/file.t
|
|
)
|
|
|
|
'
|
|
|
|
test_done
|