From b926752fac0fc420ae8e8d78c26f1815d35e89ed Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 1 Jul 2013 03:12:24 +0200
Subject: [PATCH] tests: Don't require bash.

Instead merge continuous regions of colored output. This way different
shell implementations shouldn't make a difference.
---
 tests/example.expected              |  4 ++--
 tests/example_err.expected          |  2 +-
 tests/example_error.expected        | 18 +++++++++---------
 tests/example_redirects.sh          |  5 +----
 tests/example_redirects.sh.expected |  6 +++---
 tests/example_simple.sh             |  5 +----
 tests/example_simple.sh.expected    |  2 +-
 tests/example_vfork.expected        |  2 +-
 tests/lib.sh                        |  7 ++++++-
 9 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/tests/example.expected b/tests/example.expected
index 72a30ac..7a8277a 100644
--- a/tests/example.expected
+++ b/tests/example.expected
@@ -1,9 +1,9 @@
 >STDERR>write to stderr: 1
 <STDERR<write to stdout
 >STDERR>error!: Cannot allocate memory
-<STDERR<>STDERR>write to stderr 2<STDERR<write to stdout 2>STDERR>
+write to stderr 2<STDERR<write to stdout 2>STDERR>
 <STDERR<
 >STDERR>more on stderr
-<STDERR<>STDERR>stderr ...
+stderr ...
 <STDERR<more on stdout
 >STDERR>x<STDERR<
diff --git a/tests/example_err.expected b/tests/example_err.expected
index 652cd81..023eb0d 100644
--- a/tests/example_err.expected
+++ b/tests/example_err.expected
@@ -7,5 +7,5 @@
 >STDERR>example_err: error: message
 <STDERR<exit code: 1
 >STDERR>example_err: warning: message: Cannot allocate memory
-<STDERR<>STDERR>example_err: warning: message
+example_err: warning: message
 <STDERR<
diff --git a/tests/example_error.expected b/tests/example_error.expected
index 463f343..a38a450 100644
--- a/tests/example_error.expected
+++ b/tests/example_error.expected
@@ -1,10 +1,10 @@
->STDERR>./example_error:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>
-<STDERR<>STDERR>./example_error:<STDERR<>STDERR>file:42:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>
-<STDERR<>STDERR>./example_error:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>: Cannot allocate memory<STDERR<>STDERR>
-<STDERR<>STDERR>./example_error:<STDERR<>STDERR>file:42:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>: Cannot allocate memory<STDERR<>STDERR>
-<STDERR<>STDERR>./example_error:<STDERR<>STDERR>file:42:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>: Cannot allocate memory<STDERR<>STDERR>
-<STDERR<>STDERR>PROG<STDERR<>STDERR><message><STDERR<>STDERR>
-<STDERR<>STDERR>PROG<STDERR<>STDERR>file:42:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>
-<STDERR<>STDERR>PROG<STDERR<>STDERR><message><STDERR<>STDERR>: Cannot allocate memory<STDERR<>STDERR>
-<STDERR<>STDERR>PROG<STDERR<>STDERR>file:42:<STDERR<>STDERR> <STDERR<>STDERR><message><STDERR<>STDERR>: Cannot allocate memory<STDERR<>STDERR>
+>STDERR>./example_error: <message>
+./example_error:file:42: <message>
+./example_error: <message>: Cannot allocate memory
+./example_error:file:42: <message>: Cannot allocate memory
+./example_error:file:42: <message>: Cannot allocate memory
+PROG<message>
+PROGfile:42: <message>
+PROG<message>: Cannot allocate memory
+PROGfile:42: <message>: Cannot allocate memory
 <STDERR<
\ No newline at end of file
diff --git a/tests/example_redirects.sh b/tests/example_redirects.sh
index e5c1601..8ac150d 100755
--- a/tests/example_redirects.sh
+++ b/tests/example_redirects.sh
@@ -1,7 +1,4 @@
-#!/bin/bash
-
-# Use bash to get consistent test results, /bin/sh can point to multiple
-# shells with different behaviour.
+#!/bin/sh
 
 # Copyright (C) 2013  Simon Ruderich
 #
diff --git a/tests/example_redirects.sh.expected b/tests/example_redirects.sh.expected
index 26a7b1a..c2d93a0 100644
--- a/tests/example_redirects.sh.expected
+++ b/tests/example_redirects.sh.expected
@@ -1,8 +1,8 @@
->STDERR>write<STDERR<>STDERR> <STDERR<>STDERR>to<STDERR<>STDERR> <STDERR<>STDERR>stderr<STDERR<>STDERR> <STDERR<>STDERR>1<STDERR<>STDERR>
+>STDERR>write to stderr 1
 <STDERR<write to stdout 1
->STDERR>write<STDERR<>STDERR> <STDERR<>STDERR>to<STDERR<>STDERR> <STDERR<>STDERR>stdout<STDERR<>STDERR> <STDERR<>STDERR>which<STDERR<>STDERR> <STDERR<>STDERR>gets<STDERR<>STDERR> <STDERR<>STDERR>redirected<STDERR<>STDERR> <STDERR<>STDERR>to<STDERR<>STDERR> <STDERR<>STDERR>stderr<STDERR<>STDERR>
+>STDERR>write to stdout which gets redirected to stderr
 <STDERR<write to stdout 2
 write to stderr which gets redirected to stdout
 write to stdout 3
->STDERR>another<STDERR<>STDERR> <STDERR<>STDERR>redirect<STDERR<>STDERR> <STDERR<>STDERR>to<STDERR<>STDERR> <STDERR<>STDERR>stderr<STDERR<>STDERR>
+>STDERR>another redirect to stderr
 <STDERR<
\ No newline at end of file
diff --git a/tests/example_simple.sh b/tests/example_simple.sh
index 4c683a0..523fe6d 100755
--- a/tests/example_simple.sh
+++ b/tests/example_simple.sh
@@ -1,7 +1,4 @@
-#!/bin/bash
-
-# Use bash to get consistent test results, /bin/sh can point to multiple
-# shells with different behaviour.
+#!/bin/sh
 
 # Copyright (C) 2013  Simon Ruderich
 #
diff --git a/tests/example_simple.sh.expected b/tests/example_simple.sh.expected
index 4b0d7e9..b01c452 100644
--- a/tests/example_simple.sh.expected
+++ b/tests/example_simple.sh.expected
@@ -1,3 +1,3 @@
 write to stdout
->STDERR>write<STDERR<>STDERR> <STDERR<>STDERR>to<STDERR<>STDERR> <STDERR<>STDERR>stderr<STDERR<>STDERR>
+>STDERR>write to stderr
 <STDERR<write to stdout without newline>STDERR>write to stderr without newline<STDERR<
\ No newline at end of file
diff --git a/tests/example_vfork.expected b/tests/example_vfork.expected
index b471378..c4c4400 100644
--- a/tests/example_vfork.expected
+++ b/tests/example_vfork.expected
@@ -1,3 +1,3 @@
 >STDERR>Before vfork().
-<STDERR<>STDERR>After vfork().
+After vfork().
 <STDERR<
diff --git a/tests/lib.sh b/tests/lib.sh
index 2f2c736..08309c7 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -99,6 +99,11 @@ run_test() {
         $valgrind_cmd "$@" "$testcase" > "$output" 2>&1
     )
 
+    # 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"
+    mv "$output.tmp" "$output"
+
     diff -u "$expected" "$output" \
         || die 'failed!'
     rm "$output"
@@ -118,7 +123,7 @@ test_script() {
     run_test "$srcdir/$testcase" "$srcdir/$expected.expected" "$@"
 }
 test_script_subshell() {
-    test_script "$1" "$2" bash -c 'bash $1' ''
+    test_script "$1" "$2" sh -c 'sh $1' ''
 }
 test_program() {
     testcase="$1"
-- 
2.45.2