diff options
author | unknown <monty@donna.mysql.com> | 2001-01-03 16:54:46 +0200 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2001-01-03 16:54:46 +0200 |
commit | 6a414c5dd0e151ebf8e69883a88dab22c37b625a (patch) | |
tree | 25e3833a1efc1f22a42285c0695afbf044514f83 /mysql-test/mysql-test-run.sh | |
parent | 7772873a38ca9a7f0f57edce58a60bdbfc2130c9 (diff) | |
download | mariadb-git-6a414c5dd0e151ebf8e69883a88dab22c37b625a.tar.gz |
Removed SCCS flag from all test cases
Changed atoll -> strtoll
Extended mysql-test-run
mysql-test/t/alter_table.test:
Turn off SCCS flag
mysql-test/t/analyse.test:
Turn off SCCS flag
mysql-test/t/auto_increment.test:
Turn off SCCS flag
mysql-test/t/bdb.test:
Turn off SCCS flag
mysql-test/t/bigint.test:
Turn off SCCS flag
mysql-test/t/binary.test:
Turn off SCCS flag
mysql-test/t/case.test:
Turn off SCCS flag
mysql-test/t/comments.test:
Turn off SCCS flag
mysql-test/t/compare.test:
Turn off SCCS flag
mysql-test/t/count_distinct.test:
Turn off SCCS flag
mysql-test/t/create.test:
Turn off SCCS flag
mysql-test/t/delayed.test:
Turn off SCCS flag
mysql-test/t/delete.test:
Turn off SCCS flag
mysql-test/t/distinct.test:
Turn off SCCS flag
mysql-test/t/empty_table.test:
Turn off SCCS flag
mysql-test/t/err000001.test:
Turn off SCCS flag
mysql-test/t/explain.test:
Turn off SCCS flag
mysql-test/t/flush_table.test:
Turn off SCCS flag
mysql-test/t/foreign_key.test:
Turn off SCCS flag
mysql-test/t/fulltext.test:
Turn off SCCS flag
mysql-test/t/fulltext_multi.test:
Turn off SCCS flag
mysql-test/t/fulltext_order_by.test:
Turn off SCCS flag
mysql-test/t/func_crypt.test:
Turn off SCCS flag
mysql-test/t/func_date_add.test:
Turn off SCCS flag
mysql-test/t/func_equal.test:
Turn off SCCS flag
mysql-test/t/func_group.test:
Turn off SCCS flag
mysql-test/t/func_in.test:
Turn off SCCS flag
mysql-test/t/func_like.test:
Turn off SCCS flag
mysql-test/t/func_math.test:
Turn off SCCS flag
mysql-test/t/func_misc.test:
Turn off SCCS flag
mysql-test/t/func_op.test:
Turn off SCCS flag
mysql-test/t/func_regexp.test:
Turn off SCCS flag
mysql-test/t/func_set.test:
Turn off SCCS flag
mysql-test/t/func_str.test:
Turn off SCCS flag
mysql-test/t/func_system.test:
Turn off SCCS flag
mysql-test/t/func_test.test:
Turn off SCCS flag
mysql-test/t/func_time.test:
Turn off SCCS flag
mysql-test/t/func_timestamp.test:
Turn off SCCS flag
mysql-test/t/group_by.test:
Turn off SCCS flag
mysql-test/t/heap.test:
Turn off SCCS flag
mysql-test/t/ins000001.test:
Turn off SCCS flag
mysql-test/t/insert.test:
Turn off SCCS flag
mysql-test/t/insert_select.test:
Turn off SCCS flag
mysql-test/t/join.test:
Turn off SCCS flag
mysql-test/t/join_outer.test:
Turn off SCCS flag
mysql-test/t/key.test:
Turn off SCCS flag
mysql-test/t/key_diff.test:
Turn off SCCS flag
mysql-test/t/key_primary.test:
Turn off SCCS flag
mysql-test/t/keywords.test:
Turn off SCCS flag
mysql-test/t/limit.test:
Turn off SCCS flag
mysql-test/t/merge.test:
Turn off SCCS flag
mysql-test/t/null.test:
Turn off SCCS flag
mysql-test/t/null_key.test:
Turn off SCCS flag
mysql-test/t/odbc.test:
Turn off SCCS flag
mysql-test/t/order_by.test:
Turn off SCCS flag
mysql-test/t/outfile.test:
Turn off SCCS flag
mysql-test/t/raid.test:
Turn off SCCS flag
mysql-test/t/range.test:
Turn off SCCS flag
mysql-test/t/rename.test:
Turn off SCCS flag
mysql-test/t/replace.test:
Turn off SCCS flag
mysql-test/t/rollback.test:
Turn off SCCS flag
mysql-test/t/rpl000001.test:
Turn off SCCS flag
mysql-test/t/rpl000002.test:
Turn off SCCS flag
mysql-test/t/rpl000003.test:
Turn off SCCS flag
mysql-test/t/rpl000004.test:
Turn off SCCS flag
mysql-test/t/rpl000005.test:
Turn off SCCS flag
mysql-test/t/rpl000006.test:
Turn off SCCS flag
mysql-test/t/rpl000007.test:
Turn off SCCS flag
mysql-test/t/rpl000008.test:
Turn off SCCS flag
mysql-test/t/rpl000009.test:
Turn off SCCS flag
mysql-test/t/rpl000010.test:
Turn off SCCS flag
mysql-test/t/rpl000011.test:
Turn off SCCS flag
mysql-test/t/rpl000012.test:
Turn off SCCS flag
mysql-test/t/rpl000013.test:
Turn off SCCS flag
mysql-test/t/rpl000014.test:
Turn off SCCS flag
mysql-test/t/rpl000015.test:
Turn off SCCS flag
mysql-test/t/rpl000016.test:
Turn off SCCS flag
mysql-test/t/sel000001.test:
Turn off SCCS flag
mysql-test/t/sel000002.test:
Turn off SCCS flag
mysql-test/t/sel000003.test:
Turn off SCCS flag
mysql-test/t/sel000031.test:
Turn off SCCS flag
mysql-test/t/sel000032.test:
Turn off SCCS flag
mysql-test/t/sel000033.test:
Turn off SCCS flag
mysql-test/t/sel000100.test:
Turn off SCCS flag
mysql-test/t/select.test:
Turn off SCCS flag
mysql-test/t/select_safe.test:
Turn off SCCS flag
mysql-test/t/show_check.test:
Turn off SCCS flag
mysql-test/t/shw000001.test:
Turn off SCCS flag
mysql-test/t/tablelock.test:
Turn off SCCS flag
mysql-test/t/temp_table.test:
Turn off SCCS flag
mysql-test/t/truncate.test:
Turn off SCCS flag
mysql-test/t/type_blob.test:
Turn off SCCS flag
mysql-test/t/type_date.test:
Turn off SCCS flag
mysql-test/t/type_datetime.test:
Turn off SCCS flag
mysql-test/t/type_enum.test:
Turn off SCCS flag
mysql-test/t/type_float.test:
Turn off SCCS flag
mysql-test/t/type_ranges.test:
Turn off SCCS flag
mysql-test/t/type_time.test:
Turn off SCCS flag
mysql-test/t/type_timestamp.test:
Turn off SCCS flag
mysql-test/t/type_uint.test:
Turn off SCCS flag
mysql-test/t/type_year.test:
Turn off SCCS flag
mysql-test/t/update.test:
Turn off SCCS flag
mysql-test/t/varbinary.test:
Turn off SCCS flag
mysql-test/t/variables.test:
Turn off SCCS flag
mysql-test/t/warnings.test:
Turn off SCCS flag
BUILD/compile-alpha-cxx:
Added making of test
Docs/manual.texi:
Added more documentation to CHECK table
mysql-test/mysql-test-run.sh:
Added --local and checking if we are running as root
sql/mysqlbinlog.cc:
Changed atoll -> strtoll
sql/slave.cc:
Changed atoll -> strtoll
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a031a203262..62d0e990053 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -152,10 +152,16 @@ MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --u GDB_MASTER_INIT=$MYSQL_TMP_DIR/gdbinit.master GDB_SLAVE_INIT=$MYSQL_TMP_DIR/gdbinit.slave +USE_RUNNING_SERVER=1 +DO_GCOV="" +DO_GDB="" +DO_DDD="" + while test $# -gt 0; do case "$1" in - --force ) FORCE=1 ;; + --force ) FORCE=1 ;; --record ) RECORD=1 ;; + --local) USE_RUNNING_SERVER="" ;; --gcov ) if [ x$BINARY_DIST = x1 ] ; then $ECHO "Cannot do coverage test without the source - please use source dist" @@ -186,6 +192,20 @@ while test $# -gt 0; do shift done +# If we should run all tests cases, we will use a local server for that + +if [ -z "$1" ] +then + USE_RUNNING_SERVER="" +fi + +if [ -w / ] +then + # We are running as root; We need to add the --root argument + EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --user=root" + EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --user=root" +fi + #++ # Function Definitions #-- @@ -368,7 +388,8 @@ stop_slave () if [ x$SLAVE_RUNNING = x1 ] then $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root shutdown - if [ $? != 0 ] ; then # try harder! + if [ $? != 0 ] && [ -f $SLAVE_MYPID ] + then # try harder! $ECHO "slave not cooperating with mysqladmin, will try manual kill" kill `$CAT $SLAVE_MYPID` sleep 2 @@ -390,7 +411,8 @@ stop_master () if [ x$MASTER_RUNNING = x1 ] then $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root shutdown - if [ $? != 0 ] ; then # try harder! + if [ $? != 0 ] && [ -f $MASTER_MYPID ] + then # try harder! $ECHO "master not cooperating with mysqladmin, will try manual kill" kill `$CAT $MASTER_MYPID` sleep 2 @@ -544,7 +566,7 @@ run_testcase () $ECHO "$RES_SPACE [ skipped ]" fi fi - fi + fi } @@ -565,7 +587,7 @@ mysql_install_db #do not automagically start deamons if we are in gdb or running only one test #case -if [ -z "$DO_GDB" ] && [ -z "$1" ] && [ -z "$DO_DDD" ] +if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ] then mysql_start fi @@ -589,8 +611,8 @@ then run_testcase $tf done fi -else - tname=`$BASENAME $1 .test` +else +tname=`$BASENAME $1 .test` tf=$TESTDIR/$tname.$TESTSUFFIX if [ -f $tf ] ; then run_testcase $tf @@ -604,7 +626,7 @@ $ECHO $RM -f $TIMEFILE -if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ] +if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ] then mysql_stop fi |