aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-03-17 22:45:22 +0100
committerJohannes Sixt <j6t@kdbg.org>2009-03-19 21:47:14 +0100
commit5b46a4285f3588eaa7e53d513025b28f9f5bfec7 (patch)
tree68066189b79dc8ccd45b14677366235c657fc52c /t
parentfae74a04d75e820c5150cfb0cb4c044bf4488007 (diff)
downloadgit-5b46a4285f3588eaa7e53d513025b28f9f5bfec7.tar.gz
git-5b46a4285f3588eaa7e53d513025b28f9f5bfec7.tar.xz
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t0050-filesystem.sh9
-rwxr-xr-xt/t3600-rm.sh3
-rwxr-xr-xt/t7005-editor.sh29
3 files changed, 22 insertions, 19 deletions
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 7edf49db3..a449580c8 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -8,6 +8,7 @@ auml=`printf '\xc3\xa4'`
aumlcdiar=`printf '\x61\xcc\x88'`
case_insensitive=
+unibad=
test_expect_success 'see if we expect ' '
test_case=test_expect_success
@@ -19,7 +20,6 @@ test_expect_success 'see if we expect ' '
then
test_case=test_expect_failure
case_insensitive=t
- say "will test on a case insensitive filesystem"
fi &&
rm -fr junk &&
mkdir junk &&
@@ -27,13 +27,18 @@ test_expect_success 'see if we expect ' '
case "$(cd junk && echo *)" in
"$aumlcdiar")
test_unicode=test_expect_failure
- say "will test on a unicode corrupting filesystem"
+ unibad=t
;;
*) ;;
esac &&
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"
then
test_expect_success "detection of case insensitive filesystem during repo init" '
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 74ea8e09f..2aefbcf47 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -21,10 +21,11 @@ embedded'
embedded' &&
git commit -m 'add files with tabs and newlines'
else
- say 'Your filesystem does not allow tabs in filenames.'
test_tabs=n
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
# git rm barfs, but if the test is run as root that cannot be
# arranged.
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 2d919d69e..2f8404afb 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -87,30 +87,27 @@ do
'
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' '
- if echo "echo space > \"\$1\"" > "e space.sh"
- then
- chmod a+x "e space.sh" &&
- 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
+ chmod a+x "e space.sh" &&
+ GIT_EDITOR="./e\ space.sh" git commit --amend &&
+ test space = "$(git show -s --pretty=format:%s)"
'
unset GIT_EDITOR
test_expect_success 'core.editor with a space' '
- if test -f "e space.sh"
- then
- git config core.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
+ git config core.editor \"./e\ space.sh\" &&
+ git commit --amend &&
+ test space = "$(git show -s --pretty=format:%s)"
'