mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
1997e91f4b
The function p4CmdList accepts a new argument: skip_info. When set to True it ignores any 'code':'info' entry (skip_info=False by default). That allows us to fix some of the tests in t9831-git-p4-triggers.sh known to be broken with verobse p4 triggers Signed-off-by: Miguel Torroja <miguel.torroja@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
103 lines
1.8 KiB
Bash
Executable file
103 lines
1.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 with server triggers'
|
|
|
|
. ./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"
|
|
echo file2 >file2 &&
|
|
p4 add file2 &&
|
|
p4 submit -d "change 2"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone with extra info lines from verbose p4 trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-change "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 change -o | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot/@all &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
)
|
|
'
|
|
|
|
test_expect_success 'import with extra info lines from verbose p4 trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$cli" &&
|
|
echo file3 >file3 &&
|
|
p4 add file3 &&
|
|
p4 submit -d "change 3"
|
|
) &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-describe "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 describe 1 | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot/@all &&
|
|
(
|
|
cd "$git" &&
|
|
git p4 sync
|
|
)&&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
)
|
|
'
|
|
|
|
test_expect_success 'submit description with extra info lines from verbose p4 change trigger' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers: p4triggertest-command command pre-user-change "echo verbose trigger"
|
|
EOF
|
|
) &&
|
|
(
|
|
p4 change -o | grep -s "verbose trigger"
|
|
) &&
|
|
git p4 clone --dest="$git" //depot &&
|
|
(
|
|
cd "$git" &&
|
|
git config git-p4.skipSubmitEdit true &&
|
|
echo file4 >file4 &&
|
|
git add file4 &&
|
|
git commit -m file4 &&
|
|
git p4 submit
|
|
) &&
|
|
(
|
|
p4 triggers -i <<-EOF
|
|
Triggers:
|
|
EOF
|
|
) &&
|
|
(
|
|
cd "$cli" &&
|
|
test_path_is_file file4
|
|
)
|
|
'
|
|
|
|
test_expect_success 'kill p4d' '
|
|
kill_p4d
|
|
'
|
|
|
|
test_done
|