Merge branch 'rr/tests-dedup-test-config' into maint
* rr/tests-dedup-test-config: t4018,7810,7811: remove test_config() redefinition
This commit is contained in:
commit
5753e1709e
@ -93,11 +93,6 @@ sed -e '
|
|||||||
s/song;/song();/
|
s/song;/song();/
|
||||||
' <Beer.perl >Beer-correct.perl
|
' <Beer.perl >Beer-correct.perl
|
||||||
|
|
||||||
test_config () {
|
|
||||||
git config "$1" "$2" &&
|
|
||||||
test_when_finished "git config --unset $1"
|
|
||||||
}
|
|
||||||
|
|
||||||
test_expect_funcname () {
|
test_expect_funcname () {
|
||||||
lang=${2-java}
|
lang=${2-java}
|
||||||
test_expect_code 1 git diff --no-index -U1 \
|
test_expect_code 1 git diff --no-index -U1 \
|
||||||
|
@ -125,11 +125,6 @@ test_expect_success 'modified file' '
|
|||||||
test_cmp empty out
|
test_cmp empty out
|
||||||
'
|
'
|
||||||
|
|
||||||
test_config() {
|
|
||||||
git config "$1" "$2" &&
|
|
||||||
test_when_finished "git config --unset $1"
|
|
||||||
}
|
|
||||||
|
|
||||||
test_expect_success 'copes with color settings' '
|
test_expect_success 'copes with color settings' '
|
||||||
rm -f actual &&
|
rm -f actual &&
|
||||||
echo grep.h >expect &&
|
echo grep.h >expect &&
|
||||||
|
Loading…
Reference in New Issue
Block a user