mirror of
https://github.com/git/git.git
synced 2024-05-20 22:46:27 +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>
63 lines
1.3 KiB
Bash
Executable File
63 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 support for file type change'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'create files' '
|
|
(
|
|
cd "$cli" &&
|
|
p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i &&
|
|
cat >file1 <<-EOF &&
|
|
text without any funny substitution business
|
|
EOF
|
|
cat >file2 <<-EOF &&
|
|
second file whose type will change
|
|
EOF
|
|
p4 add file1 file2 &&
|
|
p4 submit -d "add files"
|
|
)
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'change file to symbolic link' '
|
|
git p4 clone --dest="$git" //depot@all &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
|
|
rm file2 &&
|
|
ln -s file1 file2 &&
|
|
git add file2 &&
|
|
git commit -m "symlink file1 to file2" &&
|
|
git p4 submit &&
|
|
p4 filelog -m 1 //depot/file2 >filelog &&
|
|
grep "(symlink)" filelog
|
|
)
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'change symbolic link to file' '
|
|
git p4 clone --dest="$git" //depot@all &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
|
|
rm file2 &&
|
|
cat >file2 <<-EOF &&
|
|
This is another content for the second file.
|
|
EOF
|
|
git add file2 &&
|
|
git commit -m "re-write file2" &&
|
|
git p4 submit &&
|
|
p4 filelog -m 1 //depot/file2 >filelog &&
|
|
grep "(text)" filelog
|
|
)
|
|
'
|
|
|
|
test_done
|