summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2008-05-29 16:16:21 +1000
committerJon Loeliger <jdl@jdl.com>2008-05-29 08:16:03 -0500
commitfc6e6f8d916b0d52b59a1c2a66f280e7fb7a80f5 (patch)
tree8ce0172ae1a5646559385305b3f7034003ffa295
parentaa1baab3cc184169cfb05dfe289b5179c8333e3c (diff)
downloaddtc-fc6e6f8d916b0d52b59a1c2a66f280e7fb7a80f5.tar.gz
dtc: Remove some small bashisms from test scripts
Some of the helper scripts used to run testcases contain some constructs that are bashisms. Or at least which don't work on dash, the minimal shell used as /bin/sh on recent Ubuntu systems. This patch removes these constructs so that the testsuite will pass "out of the box" on systems where /bin/sh is dash. Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rwxr-xr-xtests/dtc-checkfails.sh2
-rw-r--r--tests/dtc-fatal.sh2
-rw-r--r--tests/tests.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/dtc-checkfails.sh b/tests/dtc-checkfails.sh
index 265173c..c58694f 100755
--- a/tests/dtc-checkfails.sh
+++ b/tests/dtc-checkfails.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-. tests.sh
+. ./tests.sh
for x; do
shift
diff --git a/tests/dtc-fatal.sh b/tests/dtc-fatal.sh
index 8eb1b44..6781ced 100644
--- a/tests/dtc-fatal.sh
+++ b/tests/dtc-fatal.sh
@@ -1,6 +1,6 @@
#! /bin/sh
-. tests.sh
+. ./tests.sh
verbose_run $VALGRIND "$DTC" -o/dev/null "$@"
ret="$?"
diff --git a/tests/tests.sh b/tests/tests.sh
index 28b3fb1..30ffead 100644
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -23,7 +23,7 @@ verbose_run () {
verbose_run_log () {
LOG="$1"
shift
- "$@" &> "$LOG"
+ "$@" > "$LOG" 2>&1
ret=$?
if [ -z "$QUIET_TEST" ]; then
cat "$LOG" >&2