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>
68 lines
1.4 KiB
Bash
Executable File
68 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git p4 tests for excluded paths during clone and sync'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
# Create a repo with the structure:
|
|
#
|
|
# //depot/wanted/foo
|
|
# //depot/discard/foo
|
|
#
|
|
# Check that we can exclude a subdirectory with both
|
|
# clone and sync operations.
|
|
|
|
test_expect_success 'create exclude repo' '
|
|
(
|
|
cd "$cli" &&
|
|
mkdir -p wanted discard &&
|
|
echo wanted >wanted/foo &&
|
|
echo discard >discard/foo &&
|
|
p4 add wanted/foo discard/foo &&
|
|
p4 submit -d "initial revision"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'check the repo was created correctly' '
|
|
test_when_finished cleanup_git &&
|
|
git p4 clone --dest="$git" //depot/...@all &&
|
|
(
|
|
cd "$git" &&
|
|
test_path_is_file wanted/foo &&
|
|
test_path_is_file discard/foo
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone, excluding part of repo' '
|
|
test_when_finished cleanup_git &&
|
|
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
|
|
(
|
|
cd "$git" &&
|
|
test_path_is_file wanted/foo &&
|
|
test_path_is_missing discard/foo
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone, then sync with exclude' '
|
|
test_when_finished cleanup_git &&
|
|
git p4 clone -//depot/discard/... --dest="$git" //depot/...@all &&
|
|
(
|
|
cd "$cli" &&
|
|
p4 edit wanted/foo discard/foo &&
|
|
date >>wanted/foo &&
|
|
date >>discard/foo &&
|
|
p4 submit -d "updating" &&
|
|
|
|
cd "$git" &&
|
|
git p4 sync -//depot/discard/... &&
|
|
test_path_is_file wanted/foo &&
|
|
test_path_is_missing discard/foo
|
|
)
|
|
'
|
|
|
|
test_done
|