# HG changeset patch # User mas01cr # Date 1206968546 0 # Node ID fe4dc39b2dd7555d9494c2dca4a26a5b003849dd # Parent a6c9a1c686468c5d54133320c380deb3bd0b94cb Perform the incredibly tedious job of making the tests bash scripts, rather than shell scripts. This seems easier than emulating all the useful error-handling features that bash provides in POSIX functionality as provided by dash(1). diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0001/run-test.sh --- a/tests/0001/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0001/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0002/run-test.sh --- a/tests/0002/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0002/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0003/run-test.sh --- a/tests/0003/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0003/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0004/run-test.sh --- a/tests/0004/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0004/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0006/run-test.sh --- a/tests/0006/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0006/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0007/run-test.sh --- a/tests/0007/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0007/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0008/run-test.sh --- a/tests/0008/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0008/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0009/run-test.sh --- a/tests/0009/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0009/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0010/run-test.sh --- a/tests/0010/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0010/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0011/run-test.sh --- a/tests/0011/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0011/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0012/run-test.sh --- a/tests/0012/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0012/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0014/run-test.sh --- a/tests/0014/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0014/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0016/run-test.sh --- a/tests/0016/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0016/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0017/run-test.sh --- a/tests/0017/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0017/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0018/run-test.sh --- a/tests/0018/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0018/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0019/run-test.sh --- a/tests/0019/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0019/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0020/run-test.sh --- a/tests/0020/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0020/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0021/run-test.sh --- a/tests/0021/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0021/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0022/run-test.sh --- a/tests/0022/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0022/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0023/run-test.sh --- a/tests/0023/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0023/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0024/run-test.sh --- a/tests/0024/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0024/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0025/run-test.sh --- a/tests/0025/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0025/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0026/run-test.sh --- a/tests/0026/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0026/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0027/run-test.sh --- a/tests/0027/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0027/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0028/run-test.sh --- a/tests/0028/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0028/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0029/run-test.sh --- a/tests/0029/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0029/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0030/run-test.sh --- a/tests/0030/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0030/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0031/run-test.sh --- a/tests/0031/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0031/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0032/run-test.sh --- a/tests/0032/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0032/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0033/run-test.sh --- a/tests/0033/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0033/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0034/run-test.sh --- a/tests/0034/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0034/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/0035/run-test.sh --- a/tests/0035/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/0035/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/9000/run-test.sh --- a/tests/9000/run-test.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/9000/run-test.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash . ../test-utils.sh diff -r a6c9a1c68646 -r fe4dc39b2dd7 tests/run-tests.sh --- a/tests/run-tests.sh Mon Mar 31 11:52:59 2008 +0000 +++ b/tests/run-tests.sh Mon Mar 31 13:02:26 2008 +0000 @@ -1,12 +1,12 @@ -#! /bin/sh +#! /bin/bash AUDIODB=../../${EXECUTABLE:-audioDB} export AUDIODB -if [ -x ${AUDIODB:3} ]; then +if [ -x ${AUDIODB#../} ]; then : else - echo Cannot execute audioDB: ${AUDIODB:3} + echo Cannot execute audioDB: ${AUDIODB#../} exit 1 fi @@ -24,7 +24,7 @@ awk '{ printf(" (%s)",$0) }' < ${file}/short-description fi echo -n : - (cd ${file} && sh ./run-test.sh > test.out 2> test.err) + (cd ${file} && /bin/bash ./run-test.sh > test.out 2> test.err) EXIT_STATUS=$? if [ ${EXIT_STATUS} -eq 14 ]; then echo " n/a."