diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am index 611362ad735..03b53509f05 100644 --- a/ndb/test/run-test/Makefile.am +++ b/ndb/test/run-test/Makefile.am @@ -18,5 +18,8 @@ LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a +wrappersdir=$(prefix)/bin +wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/ndb/test/run-test/atrt-mysql-test-run b/ndb/test/run-test/atrt-mysql-test-run new file mode 100755 index 00000000000..3a044e43288 --- /dev/null +++ b/ndb/test/run-test/atrt-mysql-test-run @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e -x +cd $MYSQL_BASE_DIR/mysql-test +./mysql-test-run --with-ndbcluster --ndbconnectstring=$NDB_CONNECTSTRING $* diff --git a/ndb/test/run-test/atrt-testBackup b/ndb/test/run-test/atrt-testBackup new file mode 100755 index 00000000000..3ed7641a42e --- /dev/null +++ b/ndb/test/run-test/atrt-testBackup @@ -0,0 +1,6 @@ +#!/bin/sh + +PATH=$PATH:$MYSQL_BASE_DIR/bin +export PATH + +testBackup $* diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt index 15fa4db4abc..35e0d2e9a46 100644 --- a/ndb/test/run-test/daily-devel-tests.txt +++ b/ndb/test/run-test/daily-devel-tests.txt @@ -1,3 +1,7 @@ +max-time: 2500 +cmd: atrt-mysql-test-run +args: --do-test=ndb --force + # # INDEX # @@ -19,7 +23,7 @@ args: -n CreateLoadDrop T1 T10 # BACKUP # max-time: 600 -cmd: testBackup +cmd: atrt-testBackup args: -n BackupOne T1 T6 T3 I3 #max-time: 600 diff --git a/ndb/test/run-test/main.cpp b/ndb/test/run-test/main.cpp index bdc40fb02b2..2252451210b 100644 --- a/ndb/test/run-test/main.cpp +++ b/ndb/test/run-test/main.cpp @@ -451,6 +451,7 @@ setup_config(atrt_config& config){ proc.m_proc.m_stderr = "2>&1"; proc.m_proc.m_runas = proc.m_host->m_user; 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_ndb_mgm_port = g_default_base_port; if(split1[0] == "mgm"){ @@ -501,8 +502,8 @@ setup_config(atrt_config& config){ // Setup connect string for(size_t i = 0; i