Browse Source
* pw/p4-update: git-p4: handle files with shell metacharacters git-p4: keyword flattening fixes git-p4: stop ignoring apple filetype git-p4: recognize all p4 filetypes git-p4: handle utf16 filetype properly git-p4 tests: refactor and cleanupmaint
Junio C Hamano
13 years ago
6 changed files with 919 additions and 423 deletions
@ -0,0 +1,74 @@
@@ -0,0 +1,74 @@
|
||||
# |
||||
# Library code for git-p4 tests |
||||
# |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
if ! test_have_prereq PYTHON; then |
||||
skip_all='skipping git-p4 tests; python not available' |
||||
test_done |
||||
fi |
||||
( p4 -h && p4d -h ) >/dev/null 2>&1 || { |
||||
skip_all='skipping git-p4 tests; no p4 or p4d' |
||||
test_done |
||||
} |
||||
|
||||
GITP4="$GIT_BUILD_DIR/contrib/fast-import/git-p4" |
||||
|
||||
# Try to pick a unique port: guess a large number, then hope |
||||
# no more than one of each test is running. |
||||
# |
||||
# This does not handle the case where somebody else is running the |
||||
# same tests and has chosen the same ports. |
||||
testid=${this_test#t} |
||||
git_p4_test_start=9800 |
||||
P4DPORT=$((10669 + ($testid - $git_p4_test_start))) |
||||
|
||||
export P4PORT=localhost:$P4DPORT |
||||
export P4CLIENT=client |
||||
|
||||
db="$TRASH_DIRECTORY/db" |
||||
cli="$TRASH_DIRECTORY/cli" |
||||
git="$TRASH_DIRECTORY/git" |
||||
pidfile="$TRASH_DIRECTORY/p4d.pid" |
||||
|
||||
start_p4d() { |
||||
mkdir -p "$db" "$cli" "$git" && |
||||
( |
||||
p4d -q -r "$db" -p $P4DPORT & |
||||
echo $! >"$pidfile" |
||||
) && |
||||
for i in 1 2 3 4 5 ; do |
||||
p4 info >/dev/null 2>&1 && break || true && |
||||
echo waiting for p4d to start && |
||||
sleep 1 |
||||
done && |
||||
# complain if it never started |
||||
p4 info >/dev/null && |
||||
( |
||||
cd "$cli" && |
||||
p4 client -i <<-EOF |
||||
Client: client |
||||
Description: client |
||||
Root: $cli |
||||
View: //depot/... //client/... |
||||
EOF |
||||
) |
||||
} |
||||
|
||||
kill_p4d() { |
||||
pid=$(cat "$pidfile") |
||||
# it had better exist for the first kill |
||||
kill $pid && |
||||
for i in 1 2 3 4 5 ; do |
||||
kill $pid >/dev/null 2>&1 || break |
||||
sleep 1 |
||||
done && |
||||
# complain if it would not die |
||||
test_must_fail kill $pid >/dev/null 2>&1 && |
||||
rm -rf "$db" "$cli" "$pidfile" |
||||
} |
||||
|
||||
cleanup_git() { |
||||
rm -rf "$git" |
||||
} |
||||
@ -0,0 +1,233 @@
@@ -0,0 +1,233 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='git-p4 p4 branching tests' |
||||
|
||||
. ./lib-git-p4.sh |
||||
|
||||
test_expect_success 'start p4d' ' |
||||
start_p4d |
||||
' |
||||
|
||||
# |
||||
# 1: //depot/main/f1 |
||||
# 2: //depot/main/f2 |
||||
# 3: integrate //depot/main/... -> //depot/branch1/... |
||||
# 4: //depot/main/f4 |
||||
# 5: //depot/branch1/f5 |
||||
# .: named branch branch2 |
||||
# 6: integrate -b branch2 |
||||
# 7: //depot/branch2/f7 |
||||
# 8: //depot/main/f8 |
||||
# |
||||
test_expect_success 'basic p4 branches' ' |
||||
( |
||||
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" && |
||||
|
||||
p4 integrate //depot/main/... //depot/branch1/... && |
||||
p4 submit -d "integrate main to branch1" && |
||||
|
||||
echo f4 >main/f4 && |
||||
p4 add main/f4 && |
||||
p4 submit -d "main/f4" && |
||||
|
||||
echo f5 >branch1/f5 && |
||||
p4 add branch1/f5 && |
||||
p4 submit -d "branch1/f5" && |
||||
|
||||
p4 branch -i <<-EOF && |
||||
Branch: branch2 |
||||
View: //depot/main/... //depot/branch2/... |
||||
EOF |
||||
|
||||
p4 integrate -b branch2 && |
||||
p4 submit -d "integrate main to branch2" && |
||||
|
||||
echo f7 >branch2/f7 && |
||||
p4 add branch2/f7 && |
||||
p4 submit -d "branch2/f7" && |
||||
|
||||
echo f8 >main/f8 && |
||||
p4 add main/f8 && |
||||
p4 submit -d "main/f8" |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import main, no branch detection' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot/main@all && |
||||
( |
||||
cd "$git" && |
||||
git log --oneline --graph --decorate --all && |
||||
git rev-list master >wc && |
||||
test_line_count = 4 wc |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import branch1, no branch detection' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot/branch1@all && |
||||
( |
||||
cd "$git" && |
||||
git log --oneline --graph --decorate --all && |
||||
git rev-list master >wc && |
||||
test_line_count = 2 wc |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import branch2, no branch detection' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot/branch2@all && |
||||
( |
||||
cd "$git" && |
||||
git log --oneline --graph --decorate --all && |
||||
git rev-list master >wc && |
||||
test_line_count = 2 wc |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import depot, no branch detection' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot@all && |
||||
( |
||||
cd "$git" && |
||||
git log --oneline --graph --decorate --all && |
||||
git rev-list master >wc && |
||||
test_line_count = 8 wc |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import depot, branch detection' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" --detect-branches //depot@all && |
||||
( |
||||
cd "$git" && |
||||
|
||||
git log --oneline --graph --decorate --all && |
||||
|
||||
# 4 main commits |
||||
git rev-list master >wc && |
||||
test_line_count = 4 wc && |
||||
|
||||
# 3 main, 1 integrate, 1 on branch2 |
||||
git rev-list p4/depot/branch2 >wc && |
||||
test_line_count = 5 wc && |
||||
|
||||
# no branch1, since no p4 branch created for it |
||||
test_must_fail git show-ref p4/depot/branch1 |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'import depot, branch detection, branchList branch definition' ' |
||||
test_when_finished cleanup_git && |
||||
test_create_repo "$git" && |
||||
( |
||||
cd "$git" && |
||||
git config git-p4.branchList main:branch1 && |
||||
"$GITP4" clone --dest=. --detect-branches //depot@all && |
||||
|
||||
git log --oneline --graph --decorate --all && |
||||
|
||||
# 4 main commits |
||||
git rev-list master >wc && |
||||
test_line_count = 4 wc && |
||||
|
||||
# 3 main, 1 integrate, 1 on branch2 |
||||
git rev-list p4/depot/branch2 >wc && |
||||
test_line_count = 5 wc && |
||||
|
||||
# 2 main, 1 integrate, 1 on branch1 |
||||
git rev-list p4/depot/branch1 >wc && |
||||
test_line_count = 4 wc |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'restart p4d' ' |
||||
kill_p4d && |
||||
start_p4d |
||||
' |
||||
|
||||
# |
||||
# 1: //depot/branch1/file1 |
||||
# //depot/branch1/file2 |
||||
# 2: integrate //depot/branch1/... -> //depot/branch2/... |
||||
# 3: //depot/branch1/file3 |
||||
# 4: //depot/branch1/file2 (edit) |
||||
# 5: integrate //depot/branch1/... -> //depot/branch3/... |
||||
# |
||||
## Create a simple branch structure in P4 depot. |
||||
test_expect_success 'add simple p4 branches' ' |
||||
( |
||||
cd "$cli" && |
||||
mkdir branch1 && |
||||
cd branch1 && |
||||
echo file1 >file1 && |
||||
echo file2 >file2 && |
||||
p4 add file1 file2 && |
||||
p4 submit -d "branch1" && |
||||
p4 integrate //depot/branch1/... //depot/branch2/... && |
||||
p4 submit -d "branch2" && |
||||
echo file3 >file3 && |
||||
p4 add file3 && |
||||
p4 submit -d "add file3 in branch1" && |
||||
p4 open file2 && |
||||
echo update >>file2 && |
||||
p4 submit -d "update file2 in branch1" && |
||||
p4 integrate //depot/branch1/... //depot/branch3/... && |
||||
p4 submit -d "branch3" |
||||
) |
||||
' |
||||
|
||||
# Configure branches through git-config and clone them. |
||||
# All files are tested to make sure branches were cloned correctly. |
||||
# Finally, make an update to branch1 on P4 side to check if it is imported |
||||
# correctly by git-p4. |
||||
test_expect_success 'git-p4 clone simple branches' ' |
||||
test_when_finished cleanup_git && |
||||
test_create_repo "$git" && |
||||
( |
||||
cd "$git" && |
||||
git config git-p4.branchList branch1:branch2 && |
||||
git config --add git-p4.branchList branch1:branch3 && |
||||
"$GITP4" clone --dest=. --detect-branches //depot@all && |
||||
git log --all --graph --decorate --stat && |
||||
git reset --hard p4/depot/branch1 && |
||||
test -f file1 && |
||||
test -f file2 && |
||||
test -f file3 && |
||||
grep -q update file2 && |
||||
git reset --hard p4/depot/branch2 && |
||||
test -f file1 && |
||||
test -f file2 && |
||||
test ! -f file3 && |
||||
test_must_fail grep -q update file2 && |
||||
git reset --hard p4/depot/branch3 && |
||||
test -f file1 && |
||||
test -f file2 && |
||||
test -f file3 && |
||||
grep -q update file2 && |
||||
cd "$cli" && |
||||
cd branch1 && |
||||
p4 edit file2 && |
||||
echo file2_ >>file2 && |
||||
p4 submit -d "update file2 in branch3" && |
||||
cd "$git" && |
||||
git reset --hard p4/depot/branch1 && |
||||
"$GITP4" rebase && |
||||
grep -q file2_ file2 |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'kill p4d' ' |
||||
kill_p4d |
||||
' |
||||
|
||||
test_done |
||||
@ -0,0 +1,108 @@
@@ -0,0 +1,108 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='git-p4 p4 filetype tests' |
||||
|
||||
. ./lib-git-p4.sh |
||||
|
||||
test_expect_success 'start p4d' ' |
||||
start_p4d |
||||
' |
||||
|
||||
test_expect_success 'utf-16 file create' ' |
||||
( |
||||
cd "$cli" && |
||||
|
||||
# p4 saves this verbatim |
||||
printf "three\nline\ntext\n" >f-ascii && |
||||
p4 add -t text f-ascii && |
||||
|
||||
# p4 adds \377\376 header |
||||
cp f-ascii f-ascii-as-utf16 && |
||||
p4 add -t utf16 f-ascii-as-utf16 && |
||||
|
||||
# p4 saves this exactly as iconv produced it |
||||
printf "three\nline\ntext\n" | iconv -f ascii -t utf-16 >f-utf16 && |
||||
p4 add -t utf16 f-utf16 && |
||||
|
||||
# this also is unchanged |
||||
cp f-utf16 f-utf16-as-text && |
||||
p4 add -t text f-utf16-as-text && |
||||
|
||||
p4 submit -d "f files" && |
||||
|
||||
# force update of client files |
||||
p4 sync -f |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'utf-16 file test' ' |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot@all && |
||||
( |
||||
cd "$git" && |
||||
|
||||
test_cmp "$cli/f-ascii" f-ascii && |
||||
test_cmp "$cli/f-ascii-as-utf16" f-ascii-as-utf16 && |
||||
test_cmp "$cli/f-utf16" f-utf16 && |
||||
test_cmp "$cli/f-utf16-as-text" f-utf16-as-text |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'keyword file create' ' |
||||
( |
||||
cd "$cli" && |
||||
|
||||
printf "id\n\$Id\$\n\$Author\$\ntext\n" >k-text-k && |
||||
p4 add -t text+k k-text-k && |
||||
|
||||
cp k-text-k k-text-ko && |
||||
p4 add -t text+ko k-text-ko && |
||||
|
||||
cat k-text-k | iconv -f ascii -t utf-16 >k-utf16-k && |
||||
p4 add -t utf16+k k-utf16-k && |
||||
|
||||
cp k-utf16-k k-utf16-ko && |
||||
p4 add -t utf16+ko k-utf16-ko && |
||||
|
||||
p4 submit -d "k files" && |
||||
p4 sync -f |
||||
) |
||||
' |
||||
|
||||
build_smush() { |
||||
cat >k_smush.py <<-\EOF && |
||||
import re, sys |
||||
sys.stdout.write(re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$', r'$\1$', sys.stdin.read())) |
||||
EOF |
||||
cat >ko_smush.py <<-\EOF |
||||
import re, sys |
||||
sys.stdout.write(re.sub(r'(?i)\$(Id|Header):[^$]*\$', r'$\1$', sys.stdin.read())) |
||||
EOF |
||||
} |
||||
|
||||
test_expect_success 'keyword file test' ' |
||||
build_smush && |
||||
test_when_finished rm -f k_smush.py ko_smush.py && |
||||
test_when_finished cleanup_git && |
||||
"$GITP4" clone --dest="$git" //depot@all && |
||||
( |
||||
cd "$git" && |
||||
|
||||
# text, ensure unexpanded |
||||
"$PYTHON_PATH" "$TRASH_DIRECTORY/k_smush.py" <"$cli/k-text-k" >cli-k-text-k-smush && |
||||
test_cmp cli-k-text-k-smush k-text-k && |
||||
"$PYTHON_PATH" "$TRASH_DIRECTORY/ko_smush.py" <"$cli/k-text-ko" >cli-k-text-ko-smush && |
||||
test_cmp cli-k-text-ko-smush k-text-ko && |
||||
|
||||
# utf16, even though p4 expands keywords, git-p4 does not |
||||
# try to undo that |
||||
test_cmp "$cli/k-utf16-k" k-utf16-k && |
||||
test_cmp "$cli/k-utf16-ko" k-utf16-ko |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'kill p4d' ' |
||||
kill_p4d |
||||
' |
||||
|
||||
test_done |
||||
@ -0,0 +1,64 @@
@@ -0,0 +1,64 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='git-p4 transparency to shell metachars in filenames' |
||||
|
||||
. ./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" |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'shell metachars in filenames' ' |
||||
"$GITP4" clone --dest="$git" //depot && |
||||
test_when_finished cleanup_git && |
||||
( |
||||
cd "$git" && |
||||
git config git-p4.skipSubmitEditCheck true && |
||||
echo f1 >foo\$bar && |
||||
git add foo\$bar && |
||||
echo f2 >"file with spaces" && |
||||
git add "file with spaces" && |
||||
git commit -m "add files" && |
||||
P4EDITOR=touch "$GITP4" submit |
||||
) && |
||||
( |
||||
cd "$cli" && |
||||
p4 sync ... && |
||||
test -e "file with spaces" && |
||||
test -e "foo\$bar" |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'deleting with shell metachars' ' |
||||
"$GITP4" clone --dest="$git" //depot && |
||||
test_when_finished cleanup_git && |
||||
( |
||||
cd "$git" && |
||||
git config git-p4.skipSubmitEditCheck true && |
||||
git rm foo\$bar && |
||||
git rm file\ with\ spaces && |
||||
git commit -m "remove files" && |
||||
P4EDITOR=touch "$GITP4" submit |
||||
) && |
||||
( |
||||
cd "$cli" && |
||||
p4 sync ... && |
||||
test ! -e "file with spaces" && |
||||
test ! -e foo\$bar |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'kill p4d' ' |
||||
kill_p4d |
||||
' |
||||
|
||||
test_done |
||||
Loading…
Reference in new issue