export COLORED_STDERR_PRE
export COLORED_STDERR_POST
# And force writes to a file (unless we are testing the force).
- if test "x$force_write" != x; then
+ if test -n "$force_write"; then
COLORED_STDERR_FORCE_WRITE=1
export COLORED_STDERR_FORCE_WRITE
fi
test_script() {
testcase="$1"
expected="$2"
- shift; shift || true
+ # shift || true is not enough for dash.
+ test $# -ge 2 && shift
+ shift
if test -z "$expected"; then
expected="$testcase"
test_program() {
testcase="$1"
expected="$2"
- shift; shift || true
+ test $# -ge 2 && shift
+ shift
if test -z "$expected"; then
expected="$testcase"