diff options
| author | unknown <joreland@mysql.com> | 2005-05-07 12:00:13 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-05-07 12:00:13 +0200 |
| commit | 1351d4bb3681f50bd7cbf6d2ecdf8bc192f43177 (patch) | |
| tree | c99bcfb1e7fa79d14ba2c40bc4f92868d2985b88 /ndb/test | |
| parent | 41e51e5c63c656fad69c57d362b5162a578af8a4 (diff) | |
| parent | d869388174606af1f6e8e1807b2e7bc31176f83b (diff) | |
| download | mariadb-git-1351d4bb3681f50bd7cbf6d2ecdf8bc192f43177.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
Diffstat (limited to 'ndb/test')
| -rw-r--r-- | ndb/test/run-test/Makefile.am | 8 | ||||
| -rwxr-xr-x | ndb/test/run-test/ndb-autotest.sh | 26 |
2 files changed, 18 insertions, 16 deletions
diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am index 1067328dcc3..dfd0a8b2b0a 100644 --- a/ndb/test/run-test/Makefile.am +++ b/ndb/test/run-test/Makefile.am @@ -6,7 +6,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am test_PROGRAMS = atrt -test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt +test_DATA=daily-basic-tests.txt daily-devel-tests.txt +test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \ + conf-daily-basic-ndbmaster.txt \ + conf-daily-basic-shark.txt \ + conf-daily-devel-ndbmaster.txt \ + conf-daily-sql-ndbmaster.txt \ + conf-daily-basic-dl145a.txt test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh diff --git a/ndb/test/run-test/ndb-autotest.sh b/ndb/test/run-test/ndb-autotest.sh index acee8c8e3d0..5eb9498e878 100755 --- a/ndb/test/run-test/ndb-autotest.sh +++ b/ndb/test/run-test/ndb-autotest.sh @@ -1,7 +1,7 @@ #!/bin/sh save_args=$* -VERSION="ndb-autotest.sh version 1.01" +VERSION="ndb-autotest.sh version 1.02" DATE=`date '+%Y-%m-%d'` export DATE @@ -134,20 +134,16 @@ hosts=`cat /tmp/hosts.$DATE` if [ "$deploy" ] then - (cd / && tar cfz /tmp/build.$DATE.tgz $run_dir ) - for i in $hosts - do - ok=0 - scp /tmp/build.$DATE.tgz $i:/tmp/build.$DATE.$$.tgz && \ - ssh $i "rm -rf /space/autotest/*" && \ - ssh $i "cd / && tar xfz /tmp/build.$DATE.$$.tgz" && \ - ssh $i "rm /tmp/build.$DATE.$$.tgz" && ok=1 - if [ $ok -eq 0 ] - then - echo "$i failed during scp/ssh, excluding" - echo $i >> /tmp/failed.$DATE - fi - done + for i in $hosts + do + rsync -v -a --delete --force --ignore-errors $run_dir/ $i:$run_dir + ok=$? + if [ $ok -ne 0 ] + then + echo "$i failed during rsync, excluding" + echo $i >> /tmp/failed.$DATE + fi + done fi rm -f /tmp/build.$DATE.tgz |