Commit e0e12a67 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents daf98f12 1b001d8c

ndb/test/run-test/Makefile.am

+7 −1
Original line number Diff line number Diff line
@@ -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

ndb/test/run-test/ndb-autotest.sh

+11 −15
Original line number Diff line number Diff line 
#!/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,17 +134,13 @@ 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 ]

      rsync -v -a --delete --force --ignore-errors $run_dir/ $i:$run_dir

      ok=$?

      if [ $ok -ne 0 ]

	  then

			echo "$i failed during scp/ssh, excluding"

	  echo "$i failed during rsync, excluding"

	  echo $i >> /tmp/failed.$DATE

      fi

    done