mirror of
https://github.com/git/git.git
synced 2024-12-15 04:46:02 +08: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>
35 lines
688 B
Bash
Executable File
35 lines
688 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 handling of EDITOR'
|
|
|
|
. ./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 "file1"
|
|
)
|
|
'
|
|
|
|
# Check that the P4EDITOR argument can be given command-line
|
|
# options, which git-p4 will then pass through to the shell.
|
|
test_expect_success 'EDITOR with options' '
|
|
git p4 clone --dest="$git" //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
echo change >file1 &&
|
|
git commit -m "change" file1 &&
|
|
P4EDITOR=": >\"$git/touched\" && test-tool chmtime +5" git p4 submit &&
|
|
test_path_is_file "$git/touched"
|
|
)
|
|
'
|
|
|
|
test_done
|