tests: Handle `sed` which append a trailing newline.

diff --git a/tests/example.expected b/tests/example.expected
index 7a8277a4c4a7f24b5903114b5b66b9f3511e718d..51e7f397a8f3499676f2dd84cb616ef25cf0578a 100644 (file)
--- 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 0feb438809373b36fbeb1b0425df007133505251..dac703e7e7b29486ee520bf19373942c039ae5e8 100644 (file)
--- 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 023eb0dda0a29ff4f9f8f84b21fc7512daea5fd3..95b6b65eb841b1b39263d2e3c25e8694881abfaa 100644 (file)
--- 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 a38a450b9cd9759b587bf68cbfaa181dba3e1c8d..43025755172f275c8d70edd2b912488f3d5694dd 100644 (file)
--- 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 8dee58c6831ed8378cb983797040b3665ff19c04..5ef86a93dbf2541e3f68c31d7ce98f39f53678bb 100644 (file)
--- 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 9285a602cf1a59e2db83f3128d5970e80ed29523..d6a264b2ef02bb72358ccf841d77d9559d0a9fa8 100644 (file)
--- 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 c2d93a0ce07f9c61d3bb80e52478d2a9f5a97992..b0db977c6f6932a6a6a0d09e2a1182cd80ea5e8a 100644 (file)
--- 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 b01c4524e1185ea6a744ea6476521c760fc3f0e6..fc07e3ce0583b1d83601d6ffd215b5100d9322c5 100644 (file)
--- 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 0ab9883fbda8af0f43917f2f30a9e1e9d214c338..8e60add6a0045201975a7ad05f71ca705965b5fd 100644 (file)
--- 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 c4c4400af674e0e3ea03d38288183037d6f85fdf..22c74b28a8394637f2657cf4a0f01ca00a952cb5 100644 (file)
--- 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 08309c7401af00ffd5572d7d3a386a92019e890b..33a3721f751f9268a6f653940c72a5a733d016e7 100644 (file)
--- 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"