[PATCH] tests: added d2u to have unix style testfiles even in textmode

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Steffen Prohaska
Date: Tuesday, August 7, 2007 - 3:49 pm

This is needed if the content of files is compared with
precomputed sha1s or stored expected results.

***WARNING***
This patch is useful for testing and illustrating the problem
but not thought to be applied to any official git branch.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 t/t0000-basic.sh      |    2 +-
 t/t0020-crlf.sh       |    8 ++++----
 t/t0021-conversion.sh |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 4e49d59..bf71ce6 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -91,7 +91,7 @@ test_expect_success \
 mkdir path2 path3 path3/subp3
 for p in path0 path2/file2 path3/file3 path3/subp3/file3
 do
-    echo "hello $p" >$p
+    echo "hello $p" | d2u >$p
     ln -s "hello $p" ${p}sym
 done
 test_expect_success \
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index fe1dfd0..52dc739 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -21,10 +21,10 @@ test_expect_success setup '
 
 	git repo-config core.autocrlf false &&
 
-	for w in Hello world how are you; do echo $w; done >one &&
+	for w in Hello world how are you; do echo $w; done | d2u >one &&
 	mkdir dir &&
-	for w in I am very very fine thank you; do echo $w; done >dir/two &&
-	for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
+	for w in I am very very fine thank you; do echo $w; done | d2u  >dir/two &&
+	for w in Oh here is NULQin text here; do echo $w; done | q_to_nul | d2u >three &&
 	git add . &&
 
 	git commit -m initial &&
@@ -34,7 +34,7 @@ test_expect_success setup '
 	two=`git rev-parse HEAD:dir/two` &&
 	three=`git rev-parse HEAD:three` &&
 
-	for w in Some extra lines here; do echo $w; done >>one &&
+	for w in Some extra lines here; do echo $w; done | d2u >>one &&
 	git diff >patch.file &&
 	patched=`git hash-object --stdin <one` &&
 	git read-tree --reset -u HEAD &&
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index a839f4e..9ca11bb 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -57,7 +57,7 @@ test_expect_success expanded_in_repo '
 		echo "\$Id:NoSpaceAtFront \$"
 		echo "\$Id:NoSpaceAtEitherEnd\$"
 		echo "\$Id: NoTerminatingSymbol"
-	} > expanded-keywords &&
+	} | d2u > expanded-keywords &&
 
 	{
 		echo "File with expanded keywords"
@@ -68,7 +68,7 @@ test_expect_success expanded_in_repo '
 		echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
 		echo "\$Id: 4f21723e7b15065df7de95bd46c8ba6fb1818f4c \$"
 		echo "\$Id: NoTerminatingSymbol"
-	} > expected-output &&
+	} | d2u > expected-output &&
 
 	git add expanded-keywords &&
 	git commit -m "File with keywords expanded" &&
-- 
1.5.1.2

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
git on Cygwin: Not a valid object name HEAD, Sebastian Schuberth, (Tue Aug 7, 2:02 am)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Tue Aug 7, 4:58 am)
Re: git on Cygwin: Not a valid object name HEAD, Sebastian Schuberth, (Tue Aug 7, 5:13 am)
Re: git on Cygwin: Not a valid object name HEAD, Sebastian Schuberth, (Tue Aug 7, 6:18 am)
Re: git on Cygwin: Not a valid object name HEAD, Shawn O. Pearce, (Tue Aug 7, 7:36 am)
Re: git on Cygwin: Not a valid object name HEAD, Brian Downing, (Tue Aug 7, 7:58 am)
Re: git on Cygwin: Not a valid object name HEAD, Sebastian Schuberth, (Tue Aug 7, 8:27 am)
Re: git on Cygwin: Not a valid object name HEAD, Mark Levedahl, (Tue Aug 7, 8:29 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 7, 10:11 am)
Re: git on Cygwin: Not a valid object name HEAD, Mark Levedahl, (Tue Aug 7, 10:42 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 7, 12:41 pm)
Re: git on Cygwin: Not a valid object name HEAD, Linus Torvalds, (Tue Aug 7, 2:44 pm)
Re: git on Cygwin: Not a valid object name HEAD, Junio C Hamano, (Tue Aug 7, 3:26 pm)
Re: git on Cygwin: Not a valid object name HEAD, Junio C Hamano, (Tue Aug 7, 3:28 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 7, 3:46 pm)
[PATCH] tests: added d2u to have unix style testfiles even ..., Steffen Prohaska, (Tue Aug 7, 3:49 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 7, 4:20 pm)
Re: git on Cygwin: Not a valid object name HEAD, Linus Torvalds, (Tue Aug 7, 8:47 pm)
Re: git on Cygwin: Not a valid object name HEAD, Brian Downing, (Tue Aug 7, 9:25 pm)
Re: [PATCH] tests: added d2u to have unix style testfiles ..., Steffen Prohaska, (Tue Aug 7, 10:00 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 7, 10:46 pm)
Re: git on Cygwin: Not a valid object name HEAD, Sebastian Schuberth, (Wed Aug 8, 12:55 am)
Re: git on Cygwin: Not a valid object name HEAD, Mark Levedahl, (Wed Aug 8, 6:50 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 8:51 am)
Re: git on Cygwin: Not a valid object name HEAD, Mark Levedahl, (Wed Aug 8, 9:41 am)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Wed Aug 8, 10:20 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 12:37 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 1:13 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 1:36 pm)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Wed Aug 8, 2:30 pm)
Re: git on Cygwin: Not a valid object name HEAD, Mark Levedahl, (Wed Aug 8, 4:07 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 9:59 pm)
Re: git on Cygwin: Not a valid object name HEAD, Marius Storm-Olsen, (Wed Aug 8, 11:01 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 11:20 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Wed Aug 8, 11:38 pm)
Re: git on Cygwin: Not a valid object name HEAD, Marius Storm-Olsen, (Wed Aug 8, 11:47 pm)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Thu Aug 9, 1:50 am)
Re: git on Cygwin: Not a valid object name HEAD, Marius Storm-Olsen, (Thu Aug 9, 2:00 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Thu Aug 9, 3:33 am)
Re: git on Cygwin: Not a valid object name HEAD, Torgil Svensson, (Thu Aug 9, 11:07 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Fri Aug 10, 12:19 am)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Fri Aug 10, 3:30 am)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Fri Aug 10, 4:14 am)
Re: git on Cygwin: Not a valid object name HEAD, Torgil Svensson, (Fri Aug 10, 3:31 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Fri Aug 10, 5:43 pm)
Re: git on Cygwin: Not a valid object name HEAD, Johannes Schindelin, (Mon Aug 13, 3:50 am)
Re: git on Cygwin: Not a valid object name HEAD, Torgil Svensson, (Tue Aug 14, 5:04 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 14, 10:22 pm)
Re: git on Cygwin: Not a valid object name HEAD, David Kastrup, (Tue Aug 14, 10:30 pm)
Re: git on Cygwin: Not a valid object name HEAD, Steffen Prohaska, (Tue Aug 14, 10:43 pm)
Re: git on Cygwin: Not a valid object name HEAD, David Kastrup, (Tue Aug 14, 11:59 pm)