mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
tests: change some 'test $(git) = "x"' to test_cmp
Change some of the patterns in the test suite where we were hiding the exit code from "git" by invoking it in a sub-shell within a "test" expression to use temporary files and test_cmp instead. These are not all the occurrences of this anti-pattern, but these in particular hid issues where LSAN was dying, and I'd thus marked these tests as passing under the linux-leaks CI job in past commits with "TEST_PASSES_SANITIZE_LEAK=true". Let's deal with that by either removing that marking, or skipping specific tests under !SANITIZE_LEAK. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
715d08a9e5
commit
c4d1d52631
|
@ -65,9 +65,11 @@ test_expect_success 'check commit-tree' '
|
|||
test_path_is_file "$REAL/objects/$(objpath $SHA)"
|
||||
'
|
||||
|
||||
test_expect_success 'check rev-list' '
|
||||
test_expect_success !SANITIZE_LEAK 'check rev-list' '
|
||||
git update-ref "HEAD" "$SHA" &&
|
||||
test "$SHA" = "$(git rev-list HEAD)"
|
||||
git rev-list HEAD >actual &&
|
||||
echo $SHA >expected &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'setup_git_dir twice in subdir' '
|
||||
|
|
|
@ -14,7 +14,6 @@ only the updates to dir/sub.
|
|||
Also tested are "git add -u" without limiting, and "git add -u"
|
||||
without contents changes, and other conditions'
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
|
@ -41,20 +40,28 @@ test_expect_success update '
|
|||
'
|
||||
|
||||
test_expect_success 'update noticed a removal' '
|
||||
test "$(git ls-files dir1/sub1)" = ""
|
||||
git ls-files dir1/sub1 >out &&
|
||||
test_must_be_empty out
|
||||
'
|
||||
|
||||
test_expect_success 'update touched correct path' '
|
||||
test "$(git diff-files --name-status dir2/sub3)" = ""
|
||||
git diff-files --name-status dir2/sub3 >out &&
|
||||
test_must_be_empty out
|
||||
'
|
||||
|
||||
test_expect_success 'update did not touch other tracked files' '
|
||||
test "$(git diff-files --name-status check)" = "M check" &&
|
||||
test "$(git diff-files --name-status top)" = "M top"
|
||||
echo "M check" >expect &&
|
||||
git diff-files --name-status check >actual &&
|
||||
test_cmp expect actual &&
|
||||
|
||||
echo "M top" >expect &&
|
||||
git diff-files --name-status top >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'update did not touch untracked files' '
|
||||
test "$(git ls-files dir2/other)" = ""
|
||||
git ls-files dir2/other >out &&
|
||||
test_must_be_empty out
|
||||
'
|
||||
|
||||
test_expect_success 'cache tree has not been corrupted' '
|
||||
|
@ -76,9 +83,8 @@ test_expect_success 'update from a subdirectory' '
|
|||
'
|
||||
|
||||
test_expect_success 'change gets noticed' '
|
||||
|
||||
test "$(git diff-files --name-status dir1)" = ""
|
||||
|
||||
git diff-files --name-status dir1 >out &&
|
||||
test_must_be_empty out
|
||||
'
|
||||
|
||||
test_expect_success 'non-qualified update in subdir updates from the root' '
|
||||
|
@ -103,7 +109,8 @@ test_expect_success 'replace a file with a symlink' '
|
|||
test_expect_success 'add everything changed' '
|
||||
|
||||
git add -u &&
|
||||
test -z "$(git diff-files)"
|
||||
git diff-files >out &&
|
||||
test_must_be_empty out
|
||||
|
||||
'
|
||||
|
||||
|
@ -111,7 +118,8 @@ test_expect_success 'touch and then add -u' '
|
|||
|
||||
touch check &&
|
||||
git add -u &&
|
||||
test -z "$(git diff-files)"
|
||||
git diff-files >out &&
|
||||
test_must_be_empty out
|
||||
|
||||
'
|
||||
|
||||
|
@ -119,7 +127,8 @@ test_expect_success 'touch and then add explicitly' '
|
|||
|
||||
touch check &&
|
||||
git add check &&
|
||||
test -z "$(git diff-files)"
|
||||
git diff-files >out &&
|
||||
test_must_be_empty out
|
||||
|
||||
'
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
test_description='apply same filename'
|
||||
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
|
@ -26,10 +24,11 @@ diff a/bla/blub/dir/file b/bla/blub/dir/file
|
|||
EOF
|
||||
|
||||
test_expect_success 'apply --directory -p (1)' '
|
||||
|
||||
git apply --directory=some/sub -p3 --index patch &&
|
||||
test Bello = $(git show :some/sub/dir/file) &&
|
||||
test Bello = $(cat some/sub/dir/file)
|
||||
echo Bello >expect &&
|
||||
git show :some/sub/dir/file >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect some/sub/dir/file
|
||||
|
||||
'
|
||||
|
||||
|
@ -37,8 +36,10 @@ test_expect_success 'apply --directory -p (2) ' '
|
|||
|
||||
git reset --hard initial &&
|
||||
git apply --directory=some/sub/ -p3 --index patch &&
|
||||
test Bello = $(git show :some/sub/dir/file) &&
|
||||
test Bello = $(cat some/sub/dir/file)
|
||||
echo Bello >expect &&
|
||||
git show :some/sub/dir/file >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect some/sub/dir/file
|
||||
|
||||
'
|
||||
|
||||
|
@ -55,8 +56,10 @@ EOF
|
|||
test_expect_success 'apply --directory (new file)' '
|
||||
git reset --hard initial &&
|
||||
git apply --directory=some/sub/dir/ --index patch &&
|
||||
test content = $(git show :some/sub/dir/newfile) &&
|
||||
test content = $(cat some/sub/dir/newfile)
|
||||
echo content >expect &&
|
||||
git show :some/sub/dir/newfile >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect some/sub/dir/newfile
|
||||
'
|
||||
|
||||
cat > patch << EOF
|
||||
|
@ -72,8 +75,10 @@ EOF
|
|||
test_expect_success 'apply --directory -p (new file)' '
|
||||
git reset --hard initial &&
|
||||
git apply -p2 --directory=some/sub/dir/ --index patch &&
|
||||
test content = $(git show :some/sub/dir/newfile2) &&
|
||||
test content = $(cat some/sub/dir/newfile2)
|
||||
echo content >expect &&
|
||||
git show :some/sub/dir/newfile2 >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect some/sub/dir/newfile2
|
||||
'
|
||||
|
||||
cat > patch << EOF
|
||||
|
@ -107,8 +112,10 @@ EOF
|
|||
test_expect_success 'apply --directory (quoted filename)' '
|
||||
git reset --hard initial &&
|
||||
git apply --directory=some/sub/dir/ --index patch &&
|
||||
test content = $(git show :some/sub/dir/quotefile) &&
|
||||
test content = $(cat some/sub/dir/quotefile)
|
||||
echo content >expect &&
|
||||
git show :some/sub/dir/quotefile >actual &&
|
||||
test_cmp expect actual &&
|
||||
test_cmp expect some/sub/dir/quotefile
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
@ -63,9 +63,12 @@ test_expect_success '"mixed" reset is not allowed in bare' '
|
|||
test_must_fail git reset --mixed HEAD^
|
||||
'
|
||||
|
||||
test_expect_success '"soft" reset is allowed in bare' '
|
||||
test_expect_success !SANITIZE_LEAK '"soft" reset is allowed in bare' '
|
||||
git reset --soft HEAD^ &&
|
||||
test "$(git show --pretty=format:%s | head -n 1)" = "one"
|
||||
git show --pretty=format:%s >out &&
|
||||
echo one >expect &&
|
||||
head -n 1 out >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue