mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00: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>
46 lines
993 B
Bash
Executable file
46 lines
993 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git p4 handling of UTF-16 files without BOM'
|
|
|
|
. ./lib-git-p4.sh
|
|
|
|
UTF16="\227\000\227\000"
|
|
|
|
test_expect_success 'start p4d' '
|
|
start_p4d
|
|
'
|
|
|
|
test_expect_success 'init depot with UTF-16 encoded file and artificially remove BOM' '
|
|
(
|
|
cd "$cli" &&
|
|
printf "$UTF16" >file1 &&
|
|
p4 add -t utf16 file1 &&
|
|
p4 submit -d "file1"
|
|
) &&
|
|
|
|
(
|
|
cd db &&
|
|
p4d -jc &&
|
|
# P4D automatically adds a BOM. Remove it here to make the file invalid.
|
|
sed -e "\$d" depot/file1,v >depot/file1,v.new &&
|
|
mv depot/file1,v.new depot/file1,v &&
|
|
printf "@$UTF16@" >>depot/file1,v &&
|
|
p4d -jrF checkpoint.1
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone depot with invalid UTF-16 file in verbose mode' '
|
|
git p4 clone --dest="$git" --verbose //depot &&
|
|
test_when_finished cleanup_git &&
|
|
(
|
|
cd "$git" &&
|
|
printf "$UTF16" >expect &&
|
|
test_cmp_bin expect file1
|
|
)
|
|
'
|
|
|
|
test_expect_failure 'clone depot with invalid UTF-16 file in non-verbose mode' '
|
|
git p4 clone --dest="$git" //depot
|
|
'
|
|
|
|
test_done
|