database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

mysql-test-run BSD cleanups

Browse Source
This commit is contained in:
serg@serg.mysql.com
2000-10-12 15:51:19 +02:00
parent 6b214fb42c
commit f9588a3d99
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/mysql-test-run
View File

@ -56,11 +56,11 @@ MYERR="$CWD/var/log/mysqld.err"
#++ #++
# Program Definitions # Program Definitions
#-- #--
BASENAME=/bin/basename BASENAME=`which basename`
CAT=/bin/cat CAT=/bin/cat
CUT=/usr/bin/cut CUT=/usr/bin/cut
ECHO=/bin/echo ECHO=/bin/echo
EXPR=/usr/bin/expr EXPR=`which expr`
PRINTF=/usr/bin/printf PRINTF=/usr/bin/printf
RM=/bin/rm RM=/bin/rm
TIME=/usr/bin/time TIME=/usr/bin/time
@ -70,8 +70,7 @@ MYSQL_TEST="$BASEDIR/client/mysqltest"
MYSQLADMIN="$BASEDIR/client/mysqladmin" MYSQLADMIN="$BASEDIR/client/mysqladmin"
MYSQL_TEST="$MYSQL_TEST --socket=$MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent" MYSQL_TEST="$MYSQL_TEST --socket=$MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent"
INSTALL_DB="$MYBIN/mysql-test_install_db" INSTALL_DB="$MYBIN/mysql-test_install_db"
[ $1 = "-gcov" ] && DO_GCOV=1 [ "$1" = "-gcov" ] && DO_GCOV=1
#++ #++
# Terminal Modifications # Terminal Modifications
#-- #--
@ -81,8 +80,6 @@ SETCOLOR_FAILURE="$ECHO -n "
SETCOLOR_WARNING="$ECHO -n " SETCOLOR_WARNING="$ECHO -n "
SETCOLOR_NORMAL="$ECHO -n " SETCOLOR_NORMAL="$ECHO -n "
#++ #++
# Function Definitions # Function Definitions
#-- #--
@ -233,7 +230,9 @@ mysql_loadstd () {
return 1 return 1
} }
[ $DO_GCOV = 1 ] && gcov_clean # clean up stale gcov files if running with gcov [ "$DO_GCOV" -a ! -x "$GCOV" ] && error "No gcov found"
[ "$DO_GCOV" ] && gcov_clean # clean up stale gcov files if running with gcov
mysql_install_db mysql_install_db
@ -315,6 +314,6 @@ $ECHO
report_stats report_stats
$ECHO $ECHO
[ $DO_GCOV = 1 ] && gcov_collect # collect coverage information [ "$DO_GCOV" ] && gcov_collect # collect coverage information
exit 0 exit 0