Hi Junio and Andrey, On Mon, Apr 01, 2019 at 06:02:21PM +0000, Mazo, Andrey wrote: > diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh > index 6a86d6996b..c48532e12b 100755 > --- a/t/t9801-git-p4-branch.sh > +++ b/t/t9801-git-p4-branch.sh > @@ -608,10 +608,102 @@ test_expect_success 'Update a file in git side and > submit to P4 using client vie > cd branch1 && > grep "client spec" file1 > ) > ' > > +test_expect_success 'restart p4d (case folding enabled)' ' > + kill_p4d && > + start_p4d -C1 > +'
There is a semantic conflict between this patch and commit 07353d9042 (git p4 test: clean up the p4d cleanup functions, 2019-03-13) in 'sg/test-atexit' currently cooking in 'pu': this patch adds a new callsite of 'kill_p4d', but that commit renamed that function to 'stop_and_cleanup_p4d'. Consequently, t9801 on 'pu' now fails with: +kill_p4d t9801-git-p4-branch.sh: 4: eval: kill_p4d: not found error: last command exited with $?=127 not ok 28 - restart p4d (case folding enabled) https://travis-ci.org/git/git/jobs/514513463#L5827 I wonder whether it would be worth amending 07353d9042 to keep 'kill_p4d' around as a wrapper around 'stop_and_cleanup_p4d' for the time being. https://public-inbox.org/git/20190313122419.2210-9-szeder....@gmail.com/
