wl1292 -

Fix autotest of backups
Fix autotest with mysql-test-run
parent 9b5efa4c
...@@ -18,5 +18,8 @@ LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \ ...@@ -18,5 +18,8 @@ LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a $(top_builddir)/strings/libmystrings.a
wrappersdir=$(prefix)/bin
wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
#!/bin/sh
set -e -x
cd $MYSQL_BASE_DIR/mysql-test
./mysql-test-run --with-ndbcluster --ndbconnectstring=$NDB_CONNECTSTRING $*
#!/bin/sh
PATH=$PATH:$MYSQL_BASE_DIR/bin
export PATH
testBackup $*
max-time: 2500
cmd: atrt-mysql-test-run
args: --do-test=ndb --force
# #
# INDEX # INDEX
# #
...@@ -19,7 +23,7 @@ args: -n CreateLoadDrop T1 T10 ...@@ -19,7 +23,7 @@ args: -n CreateLoadDrop T1 T10
# BACKUP # BACKUP
# #
max-time: 600 max-time: 600
cmd: testBackup cmd: atrt-testBackup
args: -n BackupOne T1 T6 T3 I3 args: -n BackupOne T1 T6 T3 I3
#max-time: 600 #max-time: 600
......
...@@ -451,6 +451,7 @@ setup_config(atrt_config& config){ ...@@ -451,6 +451,7 @@ setup_config(atrt_config& config){
proc.m_proc.m_stderr = "2>&1"; proc.m_proc.m_stderr = "2>&1";
proc.m_proc.m_runas = proc.m_host->m_user; proc.m_proc.m_runas = proc.m_host->m_user;
proc.m_proc.m_ulimit = "c:unlimited"; proc.m_proc.m_ulimit = "c:unlimited";
proc.m_proc.m_env.assfmt("MYSQL_BASE_DIR=%s", dir.c_str());
proc.m_hostname = proc.m_host->m_hostname; proc.m_hostname = proc.m_host->m_hostname;
proc.m_ndb_mgm_port = g_default_base_port; proc.m_ndb_mgm_port = g_default_base_port;
if(split1[0] == "mgm"){ if(split1[0] == "mgm"){
...@@ -501,7 +502,7 @@ setup_config(atrt_config& config){ ...@@ -501,7 +502,7 @@ setup_config(atrt_config& config){
// Setup connect string // Setup connect string
for(size_t i = 0; i<config.m_processes.size(); i++){ for(size_t i = 0; i<config.m_processes.size(); i++){
config.m_processes[i].m_proc.m_env.assfmt("NDB_CONNECTSTRING=%s", config.m_processes[i].m_proc.m_env.appfmt(" NDB_CONNECTSTRING=%s",
connect_string.c_str()); connect_string.c_str());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment