database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

wl1292 -

Browse Source 
Fix autotest of backups
Fix autotest with mysql-test-run


ndb/test/run-test/atrt-testBackup:
  Rename: ndb/test/ndbapi/atrt-testBackup -> ndb/test/run-test/atrt-testBackup
ndb/test/run-test/Makefile.am:
  Install atrt wrappers
ndb/test/run-test/atrt-mysql-test-run:
  Take args from caller
ndb/test/run-test/daily-devel-tests.txt:
  Use wrapper to test backup
ndb/test/run-test/main.cpp:
  Add MYSQL_BASE_DIR to environment of test programs
This commit is contained in:
unknown
2004-09-09 08:40:20 +02:00
parent c49a08dd75
commit 6bbbccbe3a
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ndb/test/run-test/Makefile.am
View File

@ -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.%

5
ndb/test/run-test/atrt-mysql-test-run Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
set -e -x
cd $MYSQL_BASE_DIR/mysql-test
./mysql-test-run --with-ndbcluster --ndbconnectstring=$NDB_CONNECTSTRING $*

6
ndb/test/run-test/atrt-testBackup Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
PATH=$PATH:$MYSQL_BASE_DIR/bin
export PATH
testBackup $*

6
ndb/test/run-test/daily-devel-tests.txt
View File

@ -1,3 +1,7 @@
max-time: 2500
cmd: atrt-mysql-test-run
args: --do-test=ndb --force
# #
# INDEX # INDEX
# #
@ -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

5
ndb/test/run-test/main.cpp
View File

@ -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,8 +502,8 @@ 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());
} }
end: end: