From abd557a42fc13b30b63523e8c148c0e5db13ebc2 Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 1 Jul 2013 03:20:38 +0200
Subject: [PATCH] tests: Handle `sed` which append a trailing newline.

---
 tests/example.expected                   | 1 +
 tests/example_environment_empty.expected | 1 +
 tests/example_err.expected               | 1 +
 tests/example_error.expected             | 2 +-
 tests/example_exec.expected              | 1 +
 tests/example_noforce.sh.expected        | 2 +-
 tests/example_redirects.sh.expected      | 2 +-
 tests/example_simple.sh.expected         | 2 +-
 tests/example_stdio.expected             | 1 +
 tests/example_vfork.expected             | 1 +
 tests/lib.sh                             | 4 ++++
 11 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/example.expected b/tests/example.expected
index 7a8277a..51e7f39 100644
--- a/tests/example.expected
+++ b/tests/example.expected
@@ -7,3 +7,4 @@ write to stderr 2<STDERR<write to stdout 2>STDERR>
 stderr ...
 <STDERR<more on stdout
 >STDERR>x<STDERR<
+EOF
diff --git a/tests/example_environment_empty.expected b/tests/example_environment_empty.expected
index 0feb438..dac703e 100644
--- a/tests/example_environment_empty.expected
+++ b/tests/example_environment_empty.expected
@@ -7,3 +7,4 @@ more on stderr
 stderr ...
 more on stdout
 x
+EOF
diff --git a/tests/example_err.expected b/tests/example_err.expected
index 023eb0d..95b6b65 100644
--- a/tests/example_err.expected
+++ b/tests/example_err.expected
@@ -9,3 +9,4 @@
 >STDERR>example_err: warning: message: Cannot allocate memory
 example_err: warning: message
 <STDERR<
+EOF
diff --git a/tests/example_error.expected b/tests/example_error.expected
index a38a450..4302575 100644
--- a/tests/example_error.expected
+++ b/tests/example_error.expected
@@ -7,4 +7,4 @@ PROG<message>
 PROGfile:42: <message>
 PROG<message>: Cannot allocate memory
 PROGfile:42: <message>: Cannot allocate memory
-<STDERR<
\ No newline at end of file
+<STDERR<EOF
diff --git a/tests/example_exec.expected b/tests/example_exec.expected
index 8dee58c..5ef86a9 100644
--- a/tests/example_exec.expected
+++ b/tests/example_exec.expected
@@ -123,3 +123,4 @@ environ[0] = |COLORED_STDERR_PRIVATE_FDS=2,|
 environ[1] = |TEST=55|
 
 Done.
+EOF
diff --git a/tests/example_noforce.sh.expected b/tests/example_noforce.sh.expected
index 9285a60..d6a264b 100644
--- a/tests/example_noforce.sh.expected
+++ b/tests/example_noforce.sh.expected
@@ -1,3 +1,3 @@
 write to stdout
 write to stderr
-write to stdout without newlinewrite to stderr without newline
\ No newline at end of file
+write to stdout without newlinewrite to stderr without newlineEOF
diff --git a/tests/example_redirects.sh.expected b/tests/example_redirects.sh.expected
index c2d93a0..b0db977 100644
--- a/tests/example_redirects.sh.expected
+++ b/tests/example_redirects.sh.expected
@@ -5,4 +5,4 @@
 write to stderr which gets redirected to stdout
 write to stdout 3
 >STDERR>another redirect to stderr
-<STDERR<
\ No newline at end of file
+<STDERR<EOF
diff --git a/tests/example_simple.sh.expected b/tests/example_simple.sh.expected
index b01c452..fc07e3c 100644
--- a/tests/example_simple.sh.expected
+++ b/tests/example_simple.sh.expected
@@ -1,3 +1,3 @@
 write to stdout
 >STDERR>write to stderr
-<STDERR<write to stdout without newline>STDERR>write to stderr without newline<STDERR<
\ No newline at end of file
+<STDERR<write to stdout without newline>STDERR>write to stderr without newline<STDERR<EOF
diff --git a/tests/example_stdio.expected b/tests/example_stdio.expected
index 0ab9883..8e60add 100644
--- a/tests/example_stdio.expected
+++ b/tests/example_stdio.expected
@@ -26,3 +26,4 @@ z
 >STDERR>fputs_unlocked()<STDERR<
 >STDERR>x<STDERR<
 >STDERR>y<STDERR<
+EOF
diff --git a/tests/example_vfork.expected b/tests/example_vfork.expected
index c4c4400..22c74b2 100644
--- a/tests/example_vfork.expected
+++ b/tests/example_vfork.expected
@@ -1,3 +1,4 @@
 >STDERR>Before vfork().
 After vfork().
 <STDERR<
+EOF
diff --git a/tests/lib.sh b/tests/lib.sh
index 08309c7..33a3721 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -99,6 +99,10 @@ run_test() {
         $valgrind_cmd "$@" "$testcase" > "$output" 2>&1
     )
 
+    # Some sed implementations (e.g. on FreeBSD 9.1) always append a trailing
+    # newline. Add "EOF" to detect if the real output had one.
+    echo EOF >> "$output"
+
     # Merge continuous regions of colored output. The exact calls don't matter
     # as long as the output is colored.
     sed 's/<STDERR<>STDERR>//g' < "$output" > "$output.tmp"
-- 
2.43.2