2010-01-08 05:45:10 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Christian Couder
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Tests to check that "reset" options follow a known table'
|
|
|
|
|
leak tests: mark passing SANITIZE=leak tests as leak-free
Mark those remaining tests that pass when run under SANITIZE=leak with
TEST_PASSES_SANITIZE_LEAK=true, these were either omitted in
f346fcb62a0 (Merge branch 'ab/mark-leak-free-tests-even-more',
2021-12-15) and 5a4f8381b68 (Merge branch 'ab/mark-leak-free-tests',
2021-10-25), or have had their memory leaks fixed since then.
With this change there's now a a one-to-one mapping between those
tests that we have opted-in via "TEST_PASSES_SANITIZE_LEAK=true", and
those that pass with the new "check" mode:
GIT_TEST_PASSING_SANITIZE_LEAK=check \
GIT_TEST_SANITIZE_LEAK_LOG=true \
make test SANITIZE=leak
Note that the "GIT_TEST_SANITIZE_LEAK_LOG=true" is needed due to the
edge cases noted in a preceding commit, i.e. in some cases we'd pass
the test itself, but still have outstanding leaks due to ignored exit
codes.
The "GIT_TEST_SANITIZE_LEAK_LOG=true" corrects for that, we're only
marking those tests as passing that really don't have any leaks,
whether that was reflected in their exit code or not.
Note that the change here to "t9100-git-svn-basic.sh" is marking that
test as passing under SANITIZE=leak, we're removing a
"TEST_FAILS_SANITIZE_LEAK=true" line, not
"TEST_PASSES_SANITIZE_LEAK=true". See 7a98d9ab00d (revisions API: have
release_revisions() release "cmdline", 2022-04-13) for the
introduction of that t/lib-git-svn.sh-specific variable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-28 01:13:41 +02:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2010-01-08 05:45:10 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
|
|
test_expect_success 'creating initial commits' '
|
|
|
|
test_commit E file1 &&
|
|
|
|
test_commit D file1 &&
|
|
|
|
test_commit C file1
|
|
|
|
'
|
|
|
|
|
|
|
|
while read W1 I1 H1 T opt W2 I2 H2
|
|
|
|
do
|
|
|
|
test_expect_success "check: $W1 $I1 $H1 $T --$opt $W2 $I2 $H2" '
|
|
|
|
git reset --hard C &&
|
|
|
|
if test "$I1" != "$H1"
|
|
|
|
then
|
|
|
|
echo "$I1" >file1 &&
|
|
|
|
git add file1
|
|
|
|
fi &&
|
|
|
|
if test "$W1" != "$I1"
|
|
|
|
then
|
|
|
|
echo "$W1" >file1
|
|
|
|
fi &&
|
|
|
|
if test "$W2" != "XXXXX"
|
|
|
|
then
|
|
|
|
git reset --$opt $T &&
|
|
|
|
test "$(cat file1)" = "$W2" &&
|
|
|
|
git checkout-index -f -- file1 &&
|
|
|
|
test "$(cat file1)" = "$I2" &&
|
|
|
|
git checkout -f HEAD -- file1 &&
|
|
|
|
test "$(cat file1)" = "$H2"
|
|
|
|
else
|
|
|
|
test_must_fail git reset --$opt $T
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
done <<\EOF
|
|
|
|
A B C D soft A B D
|
|
|
|
A B C D mixed A D D
|
|
|
|
A B C D hard D D D
|
|
|
|
A B C D merge XXXXX
|
2010-01-19 05:25:58 +01:00
|
|
|
A B C D keep XXXXX
|
2010-01-08 05:45:10 +01:00
|
|
|
A B C C soft A B C
|
|
|
|
A B C C mixed A C C
|
|
|
|
A B C C hard C C C
|
|
|
|
A B C C merge XXXXX
|
2010-01-19 05:25:58 +01:00
|
|
|
A B C C keep A C C
|
2010-01-08 05:45:10 +01:00
|
|
|
B B C D soft B B D
|
|
|
|
B B C D mixed B D D
|
|
|
|
B B C D hard D D D
|
|
|
|
B B C D merge D D D
|
2010-01-19 05:25:58 +01:00
|
|
|
B B C D keep XXXXX
|
2010-01-08 05:45:10 +01:00
|
|
|
B B C C soft B B C
|
|
|
|
B B C C mixed B C C
|
|
|
|
B B C C hard C C C
|
|
|
|
B B C C merge C C C
|
2010-01-19 05:25:58 +01:00
|
|
|
B B C C keep B C C
|
2010-01-08 05:45:10 +01:00
|
|
|
B C C D soft B C D
|
|
|
|
B C C D mixed B D D
|
|
|
|
B C C D hard D D D
|
|
|
|
B C C D merge XXXXX
|
2010-01-19 05:25:58 +01:00
|
|
|
B C C D keep XXXXX
|
2010-01-08 05:45:10 +01:00
|
|
|
B C C C soft B C C
|
|
|
|
B C C C mixed B C C
|
|
|
|
B C C C hard C C C
|
|
|
|
B C C C merge B C C
|
2010-01-19 05:25:58 +01:00
|
|
|
B C C C keep B C C
|
2010-01-08 05:45:10 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'setting up branches to test with unmerged entries' '
|
|
|
|
git reset --hard C &&
|
|
|
|
git branch branch1 &&
|
|
|
|
git branch branch2 &&
|
|
|
|
git checkout branch1 &&
|
|
|
|
test_commit B1 file1 &&
|
|
|
|
git checkout branch2 &&
|
2010-01-16 10:20:26 +01:00
|
|
|
test_commit B file1
|
2010-01-08 05:45:10 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
while read W1 I1 H1 T opt W2 I2 H2
|
|
|
|
do
|
|
|
|
test_expect_success "check: $W1 $I1 $H1 $T --$opt $W2 $I2 $H2" '
|
2010-01-16 10:20:26 +01:00
|
|
|
git reset --hard B &&
|
2010-01-08 05:45:10 +01:00
|
|
|
test_must_fail git merge branch1 &&
|
|
|
|
cat file1 >X_file1 &&
|
|
|
|
if test "$W2" != "XXXXX"
|
|
|
|
then
|
|
|
|
git reset --$opt $T &&
|
|
|
|
if test "$W2" = "X"
|
|
|
|
then
|
|
|
|
test_cmp file1 X_file1
|
|
|
|
else
|
|
|
|
test "$(cat file1)" = "$W2"
|
|
|
|
fi &&
|
|
|
|
git checkout-index -f -- file1 &&
|
|
|
|
test "$(cat file1)" = "$I2" &&
|
|
|
|
git checkout -f HEAD -- file1 &&
|
|
|
|
test "$(cat file1)" = "$H2"
|
|
|
|
else
|
|
|
|
test_must_fail git reset --$opt $T
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
done <<\EOF
|
2010-01-16 10:20:26 +01:00
|
|
|
X U B C soft XXXXX
|
|
|
|
X U B C mixed X C C
|
|
|
|
X U B C hard C C C
|
|
|
|
X U B C merge C C C
|
2010-01-19 05:25:58 +01:00
|
|
|
X U B C keep XXXXX
|
2010-01-16 10:20:26 +01:00
|
|
|
X U B B soft XXXXX
|
|
|
|
X U B B mixed X B B
|
|
|
|
X U B B hard B B B
|
|
|
|
X U B B merge B B B
|
2010-01-19 05:26:01 +01:00
|
|
|
X U B B keep XXXXX
|
2010-01-08 05:45:10 +01:00
|
|
|
EOF
|
|
|
|
|
|
|
|
test_done
|