Skip to content

Commit

Permalink
git-p4: add test for p4 labels
Browse files Browse the repository at this point in the history
Add basic test of p4 label import. Checks label import and
import with shell metachars; labels with different length
descriptions.

Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Luke Diamand authored and Junio C Hamano committed Jan 20, 2012
1 parent affb474 commit 4139ecc
Showing 1 changed file with 72 additions and 0 deletions.
72 changes: 72 additions & 0 deletions t/t9804-git-p4-label.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
test_description='git-p4 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 ... &&
"$GITP4" 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_expect_success 'kill p4d' '
kill_p4d
'

test_done

0 comments on commit 4139ecc

Please sign in to comment.