bk commit into 4.1 tree (joreland:1.2237)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2237 05/05/07 13:23:38 joreland@stripped +3 -0
  ndb - autotest
    fixes

  ndb/test/run-test/ndb-autotest.sh
    1.8 05/05/07 13:23:35 joreland@stripped +10 -11
    more scripts updates

  ndb/test/run-test/make-config.sh
    1.5 05/05/07 13:23:35 joreland@stripped +8 -2
    output d.txt aswell

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.3 05/05/07 13:23:35 joreland@stripped +2 -2
    dl145 uses /home for running

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.2/ndb/test/run-test/conf-daily-basic-dl145a.txt	Fri May  6 19:20:29 2005
+++ 1.3/ndb/test/run-test/conf-daily-basic-dl145a.txt	Sat May  7 13:23:35 2005
@@ -1,5 +1,5 @@
 baseport: 16000
-basedir: /space/autotest
+basedir: /home/ndbdev/autotest/run
 mgm: CHOOSE_host1
 ndb: CHOOSE_host2 CHOOSE_host3 
 api: CHOOSE_host1 CHOOSE_host1 CHOOSE_host1
@@ -11,7 +11,7 @@
 BackupMemory: 64M
 MaxNoOfConcurrentScans: 100
 DataDir: .
-FileSystemPath: /space/autotest/run
+FileSystemPath: /home/ndbdev/autotest/run
 
 [MGM DEFAULT]
 PortNumber: 14000

--- 1.7/ndb/test/run-test/ndb-autotest.sh	Sat May  7 11:53:03 2005
+++ 1.8/ndb/test/run-test/ndb-autotest.sh	Sat May  7 13:23:35 2005
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 save_args=$*
-VERSION="ndb-autotest.sh version 1.02"
+VERSION="ndb-autotest.sh version 1.03"
 
 DATE=`date '+%Y-%m-%d'`
 export DATE
@@ -136,7 +136,7 @@
 then
     for i in $hosts
       do
-      rsync -v -a --delete --force --ignore-errors $run_dir/ $i:$run_dir
+      rsync -a --delete --force --ignore-errors $run_dir/ $i:$run_dir
       ok=$?
       if [ $ok -ne 0 ]
 	  then
@@ -177,7 +177,7 @@
 }
 
 choose_conf(){
-    host=`uname -n`
+    host=`hostname -s`
     if [ -f $test_dir/conf-$1-$host.txt ]
     then
 	echo "$test_dir/conf-$1-$host.txt"
@@ -203,14 +203,14 @@
 	p2=`pwd`
 	cd ..
 	tar cfz /tmp/res.$$.tgz `basename $p2`/$DATE
-	scp /tmp/res.$$.tgz $result_host:$result_path/tmp/res.$DATE.`uname -n`.$$.tgz
+	scp /tmp/res.$$.tgz $result_host:$result_path/res.$DATE.`hostname -s`.$$.tgz
 	rm -f /tmp/res.$$.tgz
 }
 
 count_hosts(){
     grep "CHOOSE_host" $1 |
-      awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |
-      wc -l
+    awk '{for(i=1; i<=NF;i++) if(match($i, "CHOOSE_host") > 0) print $i;}' |
+    | sort | uniq | wc -l
 }
 
 p=`pwd`
@@ -235,13 +235,12 @@
 		break;
 	fi
 
-	run_hosts=`echo $avail_hosts| awk '{for(i=1;i<='$count';i++)print $i;}'`
-	
-	choose $conf $run_hosts > $run_dir/d.txt
-	(cd $run_dir; $mkconfig d.txt )
+	run_hosts=`echo $avail_hosts|awk '{for(i=1;i<='$count';i++)print $i;}'`
 	echo $run_hosts >> /tmp/filter_hosts.$$	
-
+	
 	cd $run_dir
+	choose $conf $run_hosts > d.tmp
+	$mkconfig d.tmp
 	start $dir-mysql-$clone-$target $dir $res_dir &
 done
 cd $p

--- 1.4/ndb/test/run-test/make-config.sh	Fri May  6 16:41:43 2005
+++ 1.5/ndb/test/run-test/make-config.sh	Sat May  7 13:23:35 2005
@@ -5,6 +5,7 @@
 proc_no=1
 node_id=1
 
+d_file=/tmp/d.$$
 dir_file=/tmp/dirs.$$
 config_file=/tmp/config.$$
 cluster_file=/tmp/cluster.$$
@@ -74,9 +75,13 @@
 		else
 		    cnf=/dev/null
 		fi
-		;;
-	*) echo $line >> $cnf
+		line="";;
+	    *) echo $line >> $cnf; line="";;
 	esac
+	if [ "$line" ]
+	then
+	    echo $line >> $d_file
+	fi
 done
 
 cat $dir_file | xargs mkdir -p
@@ -92,4 +97,5 @@
   cp $config_file $i/config.ini
 done
 
+mv $d_file d.txt
 rm -f $config_file $dir_file $cluster_file