Call 'say' outside test_expect_success
There were some uses of 'say' inside test_expect_success. But if the tests were not run in verbose mode, this message went to /dev/null. Pull them out of test_expect_success. Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
parent
fae74a04d7
commit
5b46a4285f
@ -8,6 +8,7 @@ auml=`printf '\xc3\xa4'`
|
|||||||
aumlcdiar=`printf '\x61\xcc\x88'`
|
aumlcdiar=`printf '\x61\xcc\x88'`
|
||||||
|
|
||||||
case_insensitive=
|
case_insensitive=
|
||||||
|
unibad=
|
||||||
test_expect_success 'see if we expect ' '
|
test_expect_success 'see if we expect ' '
|
||||||
|
|
||||||
test_case=test_expect_success
|
test_case=test_expect_success
|
||||||
@ -19,7 +20,6 @@ test_expect_success 'see if we expect ' '
|
|||||||
then
|
then
|
||||||
test_case=test_expect_failure
|
test_case=test_expect_failure
|
||||||
case_insensitive=t
|
case_insensitive=t
|
||||||
say "will test on a case insensitive filesystem"
|
|
||||||
fi &&
|
fi &&
|
||||||
rm -fr junk &&
|
rm -fr junk &&
|
||||||
mkdir junk &&
|
mkdir junk &&
|
||||||
@ -27,13 +27,18 @@ test_expect_success 'see if we expect ' '
|
|||||||
case "$(cd junk && echo *)" in
|
case "$(cd junk && echo *)" in
|
||||||
"$aumlcdiar")
|
"$aumlcdiar")
|
||||||
test_unicode=test_expect_failure
|
test_unicode=test_expect_failure
|
||||||
say "will test on a unicode corrupting filesystem"
|
unibad=t
|
||||||
;;
|
;;
|
||||||
*) ;;
|
*) ;;
|
||||||
esac &&
|
esac &&
|
||||||
rm -fr junk
|
rm -fr junk
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test "$case_insensitive" &&
|
||||||
|
say "will test on a case insensitive filesystem"
|
||||||
|
test "$unibad" &&
|
||||||
|
say "will test on a unicode corrupting filesystem"
|
||||||
|
|
||||||
if test "$case_insensitive"
|
if test "$case_insensitive"
|
||||||
then
|
then
|
||||||
test_expect_success "detection of case insensitive filesystem during repo init" '
|
test_expect_success "detection of case insensitive filesystem during repo init" '
|
||||||
|
@ -21,10 +21,11 @@ embedded'
|
|||||||
embedded' &&
|
embedded' &&
|
||||||
git commit -m 'add files with tabs and newlines'
|
git commit -m 'add files with tabs and newlines'
|
||||||
else
|
else
|
||||||
say 'Your filesystem does not allow tabs in filenames.'
|
|
||||||
test_tabs=n
|
test_tabs=n
|
||||||
fi"
|
fi"
|
||||||
|
|
||||||
|
test "$test_tabs" = n && say 'Your filesystem does not allow tabs in filenames.'
|
||||||
|
|
||||||
# Later we will try removing an unremovable path to make sure
|
# Later we will try removing an unremovable path to make sure
|
||||||
# git rm barfs, but if the test is run as root that cannot be
|
# git rm barfs, but if the test is run as root that cannot be
|
||||||
# arranged.
|
# arranged.
|
||||||
|
@ -87,30 +87,27 @@ do
|
|||||||
'
|
'
|
||||||
done
|
done
|
||||||
|
|
||||||
|
if ! echo 'echo space > "$1"' > "e space.sh"
|
||||||
|
then
|
||||||
|
say "Skipping; FS does not support spaces in filenames"
|
||||||
|
test_done
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
test_expect_success 'editor with a space' '
|
test_expect_success 'editor with a space' '
|
||||||
|
|
||||||
if echo "echo space > \"\$1\"" > "e space.sh"
|
chmod a+x "e space.sh" &&
|
||||||
then
|
GIT_EDITOR="./e\ space.sh" git commit --amend &&
|
||||||
chmod a+x "e space.sh" &&
|
test space = "$(git show -s --pretty=format:%s)"
|
||||||
GIT_EDITOR="./e\ space.sh" git commit --amend &&
|
|
||||||
test space = "$(git show -s --pretty=format:%s)"
|
|
||||||
else
|
|
||||||
say "Skipping; FS does not support spaces in filenames"
|
|
||||||
fi
|
|
||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
unset GIT_EDITOR
|
unset GIT_EDITOR
|
||||||
test_expect_success 'core.editor with a space' '
|
test_expect_success 'core.editor with a space' '
|
||||||
|
|
||||||
if test -f "e space.sh"
|
git config core.editor \"./e\ space.sh\" &&
|
||||||
then
|
git commit --amend &&
|
||||||
git config core.editor \"./e\ space.sh\" &&
|
test space = "$(git show -s --pretty=format:%s)"
|
||||||
git commit --amend &&
|
|
||||||
test space = "$(git show -s --pretty=format:%s)"
|
|
||||||
else
|
|
||||||
say "Skipping; FS does not support spaces in filenames"
|
|
||||||
fi
|
|
||||||
|
|
||||||
'
|
'
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user