From f4425b50e157cf35f89ed22043b8ffd5089abdae Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 15 May 2005 06:59:34 +0200 Subject: [PATCH] mysqltest.c, mysql-test-run.sh: Not to conflict with Windows return code 2 for "not found", use 62 for "skip" mysql-test-run.sh, suppress.purify: Use Purify suppress file mysql-test/suppress.purify: Purify suppress file mysql-test/mysql-test-run.sh: Use Purify suppress file Not to conflict with Windows return code 2 for "not found", use 62 for "skip" client/mysqltest.c: Not to conflict with Windows return code 2 for "not found", use 62 for "skip" --- client/mysqltest.c | 2 +- mysql-test/mysql-test-run.sh | 9 +++------ mysql-test/suppress.purify | 10 ++++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 mysql-test/suppress.purify diff --git a/client/mysqltest.c b/client/mysqltest.c index 3eab182a74d..362b6a0b1df 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -572,7 +572,7 @@ static void abort_not_supported_test() printf("skipped\n"); free_used_memory(); my_end(MY_CHECK_ERROR); - exit(2); + exit(62); } static void verbose_msg(const char* fmt, ...) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index bdbd46ae8dd..581c6c66fdd 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -569,10 +569,7 @@ if [ x$SOURCE_DIST = x1 ] ; then NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm" if [ -n "$USE_PURIFY" ] ; then - PSUP="$MYSQL_TEST_DIR/purify.suppress" - echo "suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm" > $PSUP - echo "suppress UMR my_end; main" >> $PSUP - echo "suppress UMR _doprnt; fprintf; my_end; main" >> $PSUP + PSUP="$MYSQL_TEST_DIR/suppress.purify" PURIFYOPTIONS="-windows=no -log-file=%v.purifylog -append-logfile -add-suppression-files=$PSUP" if [ -f "${MYSQL_TEST}-purify" ] ; then MYSQL_TEST="${MYSQL_TEST}-purify" @@ -1660,11 +1657,11 @@ run_testcase () $ECHO "$RES$RES_SPACE [ pass ] $TIMER" else # why the following ``if'' ? That is why res==1 is special ? - if [ $res = 2 ]; then + if [ $res = 62 ]; then skip_inc $ECHO "$RES$RES_SPACE [ skipped ]" else - if [ $res -gt 2 ]; then + if [ $res -ne 1 ]; then $ECHO "mysqltest returned unexpected code $res, it has probably crashed" >> $TIMEFILE fi total_inc diff --git a/mysql-test/suppress.purify b/mysql-test/suppress.purify new file mode 100644 index 00000000000..58553130c51 --- /dev/null +++ b/mysql-test/suppress.purify @@ -0,0 +1,10 @@ +suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm +suppress UMR my_end; main +suppress UMR _doprnt; fprintf; my_end; main +suppress umr rw_read_held; mi_open +suppress umr _putmsg; putmsg; _tx_sndudata +suppress umr rw_read_held; Query_cache::store_query(THD*,st_table_list*); mysql_execute_command(THD*) +suppress sig ...; _select; select; handle_connections_sockets; main; _start +suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; do_command(THD*) +suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; net_safe_read +suppress sig ...; write; vio_write; net_real_write; net_write_buff(st_net*,const char*,unsigned long); my_net_write