mirror of
https://github.com/git/git.git
synced 2024-12-14 04:18:16 +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>
112 lines
2.1 KiB
Bash
Executable File
112 lines
2.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 label tests'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
# Basic p4 label tests.
|
|
#
|
|
# Note: can't have more than one label per commit - others
|
|
# are silently discarded.
|
|
#
|
|
test_expect_success 'basic p4 labels' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$cli" &&
|
|
mkdir -p main &&
|
|
|
|
echo f1 >main/f1 &&
|
|
p4 add main/f1 &&
|
|
p4 submit -d "main/f1" &&
|
|
|
|
echo f2 >main/f2 &&
|
|
p4 add main/f2 &&
|
|
p4 submit -d "main/f2" &&
|
|
|
|
echo f3 >main/file_with_\$metachar &&
|
|
p4 add main/file_with_\$metachar &&
|
|
p4 submit -d "file with metachar" &&
|
|
|
|
p4 tag -l tag_f1_only main/f1 &&
|
|
p4 tag -l tag_with\$_shell_char main/... &&
|
|
|
|
echo f4 >main/f4 &&
|
|
p4 add main/f4 &&
|
|
p4 submit -d "main/f4" &&
|
|
|
|
p4 label -i <<-EOF &&
|
|
Label: long_label
|
|
Description:
|
|
A Label first line
|
|
A Label second line
|
|
View: //depot/...
|
|
EOF
|
|
|
|
p4 tag -l long_label ... &&
|
|
|
|
p4 labels ... &&
|
|
|
|
git p4 clone --dest="$git" --detect-labels //depot@all &&
|
|
cd "$git" &&
|
|
|
|
git tag &&
|
|
git tag >taglist &&
|
|
test_line_count = 3 taglist &&
|
|
|
|
cd main &&
|
|
git checkout tag_tag_f1_only &&
|
|
! test -f f2 &&
|
|
git checkout tag_tag_with\$_shell_char &&
|
|
test -f f1 && test -f f2 && test -f file_with_\$metachar &&
|
|
|
|
git show tag_long_label | grep -q "A Label second line"
|
|
)
|
|
'
|
|
|
|
# Test some label corner cases:
|
|
#
|
|
# - two tags on the same file; both should be available
|
|
# - a tag that is only on one file; this kind of tag
|
|
# cannot be imported (at least not easily).
|
|
|
|
test_expect_failure 'two labels on the same changelist' '
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$cli" &&
|
|
mkdir -p main &&
|
|
|
|
p4 edit main/f1 main/f2 &&
|
|
echo "hello world" >main/f1 &&
|
|
echo "not in the tag" >main/f2 &&
|
|
p4 submit -d "main/f[12]: testing two labels" &&
|
|
|
|
p4 tag -l tag_f1_1 main/... &&
|
|
p4 tag -l tag_f1_2 main/... &&
|
|
|
|
p4 labels ... &&
|
|
|
|
git p4 clone --dest="$git" --detect-labels //depot@all &&
|
|
cd "$git" &&
|
|
|
|
git tag | grep tag_f1 &&
|
|
git tag | grep -q tag_f1_1 &&
|
|
git tag | grep -q tag_f1_2 &&
|
|
|
|
cd main &&
|
|
|
|
git checkout tag_tag_f1_1 &&
|
|
ls &&
|
|
test -f f1 &&
|
|
|
|
git checkout tag_tag_f1_2 &&
|
|
ls &&
|
|
test -f f1
|
|
)
|
|
'
|
|
|
|
test_done
|