From: Bert Wesarg Date: Mon, 21 Oct 2019 13:23:42 GMT Subject: [PATCH] t4014: make output-directory tests self-contained Message-ID: <8451a4dac2e1dfaae130786444531ad85807fdf7.1571664168.git.bert.wesarg@googlemail.com> As noted by Gábor in [1], the new tests in edefc31873 ("format-patch: create leading components of output directory", 2019-10-11) cannot be run independently. Fix this. [1] https://public-inbox.org/git/20191011144650.GM29845@szeder.dev/ Signed-off-by: Bert Wesarg --- Cc: Denton Liu Cc: Junio C Hamano Cc: SZEDER Gábor --- t/t4014-format-patch.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 9facc3a79e..b8969998b5 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1615,17 +1615,20 @@ test_expect_success 'format-patch -o with no leading directories' ' ' test_expect_success 'format-patch -o with leading existing directories' ' - git format-patch -o patches/side master..side && + rm -rf existing-dir && + mkdir existing-dir && + git format-patch -o existing-dir/patches master..side && count=$(git rev-list --count master..side) && - ls patches/side >list && + ls existing-dir/patches >list && test_line_count = $count list ' test_expect_success 'format-patch -o with leading non-existing directories' ' - rm -fr patches && - git format-patch -o patches/side master..side && + rm -rf non-existing-dir && + git format-patch -o non-existing-dir/patches master..side && count=$(git rev-list --count master..side) && - ls patches/side >list && + test_path_is_dir non-existing-dir && + ls non-existing-dir/patches >list && test_line_count = $count list ' -- 2.23.0.13.g28bc381d7c