test: consolidate definition of $LF

As we seem to need this variable that holds a single LF character in many places, define it in test-lib.sh and let the test scripts use it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Aug 11, 2011 · 3f4ab62 · 3f4ab62
1 parent 7f684a2
commit 3f4ab62
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/t/t1013-loose-object-format.sh b/t/t1013-loose-object-format.sh
@@ -26,8 +26,6 @@ standard format, deflated with 4KB window size: Agit/JGit on Android
 '
 
 . ./test-lib.sh
-LF='
-'
 
 assert_blob_equals() {
 	printf "%s" "$2" >expected &&

diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh
@@ -17,8 +17,6 @@ test_expect_success setup '
 	cp one original.one &&
 	cp dir/two original.two
 '
-LF='
-'
 
 test_expect_success 'update-index and ls-files' '
 	git update-index --add one &&

diff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh
@@ -10,8 +10,6 @@ test_description='quoted output'
 FN='濱野'
 GN='純'
 HT='	'
-LF='
-'
 DQ='"'
 
 echo foo 2>/dev/null > "Name and an${HT}HT"

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
@@ -10,9 +10,6 @@ Testing basic diff tool invocation
 
 . ./test-lib.sh
 
-LF='
-'
-
 remove_config_vars()
 {
 	# Unset all config variables used by git-difftool

diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -92,6 +92,10 @@ _x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
 # Zero SHA-1
 _z40=0000000000000000000000000000000000000000
 
+# Line feed
+LF='
+'
+
 # Each test should start with something like this, after copyright notices:
 #
 # test_description='Description of this test...
-Original file line number
+Diff line change
@@ Expand Up @@
     '
     . ./test-lib.sh
-    LF='
-    '
     assert_blob_equals() {
     	printf "%s" "$2" >expected &&
@@ Expand Down @@