diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/runtest.sh | 2 | ||||
| -rwxr-xr-x | scripts/test.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/runtest.sh b/scripts/runtest.sh index 884af9c5..0c933c2c 100644 --- a/scripts/runtest.sh +++ b/scripts/runtest.sh @@ -64,7 +64,7 @@ optional() testing() { - NAME="$1" + NAME="$CMDNAME $1" [ -z "$1" ] && NAME=$2 if [ $# -ne 5 ] diff --git a/scripts/test.sh b/scripts/test.sh index 2276619e..0c3d7aaf 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -29,12 +29,15 @@ if [ $# -ne 0 ] then for i in "$@" do + CMDNAME="${i##*/}" + CMDNAME="${CMDNAME%.test}" . "$TOPDIR"/tests/$i.test done else for i in "$TOPDIR"/tests/*.test do - CMDNAME="$(echo "$i" | sed 's@.*/\(.*\)\.test@\1@')" + CMDNAME="${i##*/}" + CMDNAME="${CMDNAME%.test}" if [ -h ../$CMDNAME ] || [ ! -z "$TEST_HOST" ] then cd .. && rm -rf testdir && mkdir testdir && cd testdir || exit 1 |