1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug in FINISH.sh that kept CFLAGS from being used.

Browse Source 
Allow multiple options to be passed to mysql-test-run.
This commit is contained in:
tim@cane.mysql.fi 2000-12-22 16:09:10 +02:00
parent 7e3fd8ce79
commit 94806e013d
2 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/FINISH.sh
View File

@ -6,7 +6,7 @@ for arg in "$@"; do
done done
CFLAGS="$cflags" CXX=gcc CXXFLAGS="$cxxflags" eval "$configure" eval "CFLAGS='$cflags' CXX=gcc CXXFLAGS='$cxxflags' $configure"
if [ "x$do_make" = "xno" ] ; then if [ "x$do_make" = "xno" ] ; then
exit 0 exit 0

62
mysql-test/mysql-test-run.sh
View File

@ -60,7 +60,7 @@ TIMEFILE="$MYSQL_TEST_DIR/var/tmp/mysqltest-time"
RES_SPACE=" " RES_SPACE=" "
MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \ MYSQLD_SRC_DIRS="strings mysys include extra regex isam merge myisam \
myisammrg heap sql" myisammrg heap sql"
GCOV_MSG=/tmp/mysqld-gcov.out #gcov output GCOV_MSG=/tmp/mysqld-gcov.out
GCOV_ERR=/tmp/mysqld-gcov.err GCOV_ERR=/tmp/mysqld-gcov.err
MASTER_RUNNING=0 MASTER_RUNNING=0
@ -136,41 +136,29 @@ MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --u
GDB_MASTER_INIT=/tmp/gdbinit.master GDB_MASTER_INIT=/tmp/gdbinit.master
GDB_SLAVE_INIT=/tmp/gdbinit.slave GDB_SLAVE_INIT=/tmp/gdbinit.slave
if [ "$1" = "--force" ] ; then while test $# -gt 0; do
FORCE=1 case "$1" in
shift 1 --force ) FORCE=1 ;;
fi --record ) RECORD=1 ;;
--gcov )
if [ x$BINARY_DIST = x1 ] ; then
if [ "$1" = "--record" ] ; then echo "Cannot do coverage test without the source - please use source dist"
RECORD=1 exit 1
shift 1 fi
fi DO_GCOV=1
;;
--gdb )
if [ "$1" = "--gcov" ]; if [ x$BINARY_DIST = x1 ] ; then
then echo "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with -gdb option"
if [ x$BINARY_DIST = x1 ] ; then fi
echo "Cannot do coverage test without the source - please us source dist" DO_GDB=1
exit 1 ;;
fi -- ) shift; break ;;
DO_GCOV=1 --* ) echo "Unrecognized option: $1"; exit 1 ;;
shift 1 * ) break ;;
fi esac
shift
if [ "$1" = "--gdb" ]; done
then
# if the user really wanted to run binary dist in a debugger, he can
# but we should warn him
if [ x$BINARY_DIST = x1 ] ; then
echo "Note: you will get more meaningful output on a source distribution \
compiled with debugging option when running tests with -gdb option"
fi
DO_GDB=1
shift 1
fi
#++ #++
# Function Definitions # Function Definitions
@ -289,7 +277,7 @@ start_slave()
{ {
[ x$SKIP_SLAVE = x1 ] && return [ x$SKIP_SLAVE = x1 ] && return
[ x$SLAVE_RUNNING = 1 ] && return [ x$SLAVE_RUNNING = 1 ] && return
if [ -z "$SLAVE_MASTER_INFO" ] ; then if [ -z "$SLAVE_MASTER_INF" ] ; then
master_info="--master-user=root \ master_info="--master-user=root \
--master-connect-retry=1 \ --master-connect-retry=1 \
--master-host=127.0.0.1 \ --master-host=127.0.0.1 \