test suite: Another Solaris portability fix

* tests/corrupt-reject-files, tests/crlf-handling: On Solaris, cat's
-e option is only effective if -v is specified as well.

3 files changed, 15 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b3afc7..192bf34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-06  Andreas Gruenbacher  <agruen@suse.de>
 
+	* tests/corrupt-reject-files, tests/crlf-handling: On Solaris, cat's
+	-e option is only effective if -v is specified as well.
+
 	* tests/test-lib.sh: Ignore error messages when cleaning up after a
 	test has finished.
 
diff --git a/tests/corrupt-reject-files b/tests/corrupt-reject-files
index f2be39f..19e13b0 100644
--- a/tests/corrupt-reject-files
+++ b/tests/corrupt-reject-files
@@ -46,7 +46,7 @@ Hunk #1 FAILED at 1.
 Status: 1
 EOF
 
-check 'cat -e a.rej' <<EOF
+check 'cat -ve a.rej' <<EOF
 *** a$
 --- b$
 ***************$
diff --git a/tests/crlf-handling b/tests/crlf-handling
index 1f73546..a425ff0 100644
--- a/tests/crlf-handling
+++ b/tests/crlf-handling
@@ -60,7 +60,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -72,7 +72,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -84,7 +84,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -98,7 +98,7 @@ else
     ncheck 'patch c < ab.diff'
 fi
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -114,7 +114,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b$
 EOF
 
@@ -123,7 +123,7 @@ check 'patch --binary c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -136,7 +136,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b$
 EOF
 
@@ -145,7 +145,7 @@ check 'patch --binary c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -158,7 +158,7 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b$
 EOF
 
@@ -167,7 +167,7 @@ check 'patch --binary c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 1b^M$
 EOF
 
@@ -188,6 +188,6 @@ check 'patch c < ab.diff' <<EOF
 patching file c
 EOF
 
-check 'cat -e c' <<EOF
+check 'cat -ve c' <<EOF
 2$
 EOF