[PATCH 03/10] Call 'say' outside test_expect_success

From

Johannes Sixt <j6t@kdbg.org>

Date

Mar 18, 2009, 21:27 UTC

Message-ID

<9d346b6be9eb260b94a8f1bcd995932a311f03af.1237410682.git.j6t@kdbg.org>

In-Reply-To

<cover.1237410682.git.j6t@kdbg.org>

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 t/t0050-filesystem.sh |    9 +++++++--
 t/t3600-rm.sh         |    3 ++-
 t/t7005-editor.sh     |   29 +++++++++++++----------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 7edf49d..a449580 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 74ea8e0..2aefbcf 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 2d919d6..2f8404a 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)"
 
 '
 

-- 
1.6.2.1.224.g2225f