diff options
| author | unknown <serg@serg.mysql.com> | 2000-10-12 15:51:19 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-10-12 15:51:19 +0200 |
| commit | 7268d075c1e16964c97082dced613abb3e6d7874 (patch) | |
| tree | 8f08012fe83965462d8a1b876c8185c0582146af /mysql-test | |
| parent | c808f32309363691a4e282172bbe73cf7919571c (diff) | |
| download | mariadb-git-7268d075c1e16964c97082dced613abb3e6d7874.tar.gz | |
mysql-test-run BSD cleanups
mysql-test/mysql-test-run:
BSD cleanups
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run index 28abee21b80..0bbe859e9f5 100755 --- a/mysql-test/mysql-test-run +++ b/mysql-test/mysql-test-run @@ -56,11 +56,11 @@ MYERR="$CWD/var/log/mysqld.err" #++ # Program Definitions #-- -BASENAME=/bin/basename +BASENAME=`which basename` CAT=/bin/cat CUT=/usr/bin/cut ECHO=/bin/echo -EXPR=/usr/bin/expr +EXPR=`which expr` PRINTF=/usr/bin/printf RM=/bin/rm TIME=/usr/bin/time @@ -70,8 +70,7 @@ MYSQL_TEST="$BASEDIR/client/mysqltest" MYSQLADMIN="$BASEDIR/client/mysqladmin" MYSQL_TEST="$MYSQL_TEST --socket=$MYSOCK --database=$DB --user=$DBUSER --password=$DBPASSWD --silent" INSTALL_DB="$MYBIN/mysql-test_install_db" -[ $1 = "-gcov" ] && DO_GCOV=1 - +[ "$1" = "-gcov" ] && DO_GCOV=1 #++ # Terminal Modifications #-- @@ -81,8 +80,6 @@ SETCOLOR_FAILURE="$ECHO -n [1;31m" SETCOLOR_WARNING="$ECHO -n [1;33m" SETCOLOR_NORMAL="$ECHO -n [0;39m" - - #++ # Function Definitions #-- @@ -233,7 +230,9 @@ mysql_loadstd () { 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 @@ -315,6 +314,6 @@ $ECHO report_stats $ECHO -[ $DO_GCOV = 1 ] && gcov_collect # collect coverage information +[ "$DO_GCOV" ] && gcov_collect # collect coverage information exit 0 |