summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorserg@serg.mysql.com <>2000-12-20 13:39:27 +0100
committerserg@serg.mysql.com <>2000-12-20 13:39:27 +0100
commit9eea24708c7189a4e8af7f9dfd6f4d4c045b5c09 (patch)
treeee1447dcc9c73796df8bf8d9d0f4a375a2305b66
parent94b9b751f6c27a8ab9a667d55d46e238f0e9ccc1 (diff)
downloadmariadb-git-9eea24708c7189a4e8af7f9dfd6f4d4c045b5c09.tar.gz
mysql-test-run.sh expr substr -> echo | cut
-rwxr-xr-xmysql-test/mysql-test-run.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index de477f1420f..5fe578b05a6 100755
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -68,10 +68,6 @@ SLAVE_RUNNING=0
[ -d $MY_TMP_DIR ] || mkdir -p $MY_TMP_DIR
-[ -z "$COLUMNS" ] && COLUMNS=80
-E=`expr $COLUMNS - 8`
-DASH72=`expr substr '________________________________________________________________________' 1 $E`
-
#++
# mysqld Environment Parameters
#--
@@ -113,6 +109,11 @@ TIME=/usr/bin/time
TR=/usr/bin/tr
XARGS=`which xargs | head -1`
+[ -z "$COLUMNS" ] && COLUMNS=80
+E=`$EXPR $COLUMNS - 8`
+#DASH72=`expr substr '________________________________________________________________________' 1 $E`
+DASH72=`$ECHO '________________________________________________________________________'|$CUT -c 1-$E`
+
# on source dist, we pick up freshly build executables
# on binary, use what is installed
if [ x$SOURCE_DIST = x1 ] ; then
@@ -469,7 +470,7 @@ run_testcase ()
fi
timestr="$USERT $SYST $REALT"
- pname=`$EXPR substr "$tname " 1 16`
+ pname=`$ECHO "$tname "|$CUT -c 1-16`
$SETCOLOR_NORMAL && $ECHO -n "$pname $timestr"