bzr commit into mysql-falcon branch (hky:297)

[Hakan Kuecuekyilmaz]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/

  297 Hakan Kuecuekyilmaz	2008-10-29
      Added objects test suite from mysql-test-extra-6.0
      to WFTO.
modified:
  weekly_falcon_test_overview/bzr_checkout.sh
  weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh
  weekly_falcon_test_overview/weekly_test_overview.sh

per-file messages:
  weekly_falcon_test_overview/bzr_checkout.sh
    Check out and prepare mysql-test-extra-6.0.
  weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh
    Extend wait time for objects test suite.
  weekly_falcon_test_overview/weekly_test_overview.sh
    Added objects test suite to WFTO.
=== modified file 'weekly_falcon_test_overview/bzr_checkout.sh'
--- a/weekly_falcon_test_overview/bzr_checkout.sh	2008-09-21 04:23:43 +0000
+++ b/weekly_falcon_test_overview/bzr_checkout.sh	2008-10-29 21:08:52 +0000
@@ -18,6 +18,7 @@ USER_NAME='hakank'
 FALCON='mysql-6.0-falcon'
 # FALCON='mysql-6.0-falcon-team'
 # FALCON='mysql-6.0-falcon-kevin'
+TEST_EXTRA='mysql-test-extra-6.0'
 
 #
 # Directories.
@@ -26,12 +27,15 @@ BZR_ROOT="bzr+ssh://${USER_NAME}@bk-inte
 WORK="${HOME}/work/mysql"
 FALCON_LOCAL_MASTER="${WORK}/${FALCON}-local-master"
 FALCON_WORK="${WORK}/${FALCON}"
+TEST_EXTRA_LOCAL_MASTER="${WORK}/${TEST_EXTRA}-local-master"
+TEST_EXTRA_WORK="${WORK}/${TEST_EXTRA}"
 
 #
 # Files.
 #
 LOG="${WORK}/weekly_falcon_test_overview_log.txt"
 BZR_VERSION="${WORK}/wfto_bzr_version.txt"
+
 #
 # Time stamps.
 #
@@ -42,15 +46,20 @@ echo "[INFO]: Starting Weekly Falcon Tes
 
 # Delete old working copy and files.
 rm -rf $FALCON_WORK
+rm -rf $TEST_EXTRA_WORK
 rm -f ${WORK}/bzr_pull_and_clone_date*
 
-# Get new working copy.
+#
+# Get new working copies.
+#
+
+# MYSQLD sources.
 if [ ! -d $FALCON_LOCAL_MASTER ]; then
     bzr branch ${BZR_ROOT}/${FALCON} $FALCON_LOCAL_MASTER
 fi
 
 if [ $? != 0 ]; then
-    echo "Branching from $BZR_ROOT failed." >> $LOG
+    echo "[ERROR]: Branching $FALCON from $BZR_ROOT failed." >> $LOG
     exit 1
 fi
 
@@ -59,7 +68,7 @@ bzr pull >> $LOG 2>&1
 
 # Did we pull successfully?
 if [ $? != 0 ]; then
-    echo "[ERROR]: Pull failed" >> $LOG
+    echo "[ERROR]: Pull in $FALCON_LOCAL_MASTER failed" >> $LOG
     exit 1
 fi
 
@@ -72,6 +81,32 @@ fi
 cd $FALCON_WORK
 apply_patches >> $LOG 2>&1
 
+# mysql-test-extra sources.
+if [ ! -d $TEST_EXTRA_LOCAL_MASTER ]; then
+    bzr branch ${BZR_ROOT}/${TEST_EXTRA} $TEST_EXTRA_LOCAL_MASTER
+fi
+
+if [ $? != 0 ]; then
+    # mysql-test-extra is not critical, therefore we
+    # we do not bail out in case of an error.
+    echo "[INFO]: Branching $TEST_EXTRA from $BZR_ROOT failed." >> $LOG
+fi
+
+cd $TEST_EXTRA_LOCAL_MASTER
+bzr pull >> $LOG 2>&1
+
+# Did we pull successfully?
+if [ $? != 0 ]; then
+    echo "[INFO]: Pull in $TEST_EXTRA_LOCAL_MASTER failed" >> $LOG
+fi
+
+bzr clone $TEST_EXTRA_LOCAL_MASTER $TEST_EXTRA_WORK >> $LOG 2>&1
+if [ $? != 0 ]; then
+    echo "[INFO]: Cloning of $TEST_EXTRA_WORK failed." >> $LOG
+fi
+
+ln -s ${TEST_EXTRA_WORK}/mysql-test/qa-suite/objects ${FALCON_WORK}/mysql-test/suite
+
 #
 # Run BUILD/compile-dist && make dist
 # to get source distribution archive.

=== modified file 'weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh'
--- a/weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh	2008-10-24 16:53:59 +0000
+++ b/weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh	2008-10-29 21:08:52 +0000
@@ -45,7 +45,7 @@ fi
 # Timing.
 #
 START=$(date +%s)
-DURATION=$((7 * 60 * 60))
+DURATION=$((8 * 60 * 60))
 UNTIL=$(($START + $DURATION))
 
 for i in $HOSTNAMES

=== modified file 'weekly_falcon_test_overview/weekly_test_overview.sh'
--- a/weekly_falcon_test_overview/weekly_test_overview.sh	2008-09-20 04:12:24 +0000
+++ b/weekly_falcon_test_overview/weekly_test_overview.sh	2008-10-29 21:08:52 +0000
@@ -51,6 +51,7 @@ MYSQL_TEST='mysql-test-run.pl'
 TEST_OPTIONS='--enable-disabled --force --skip-ndb'
 TEST_OPTIONS="${TEST_OPTIONS} --suite=falcon,falcon_team"
 BIG_TEST_OPTIONS="${TEST_OPTIONS} --big-test --suite-timeout=6360 --testcase-timeout=30 --do-test=.*-big"
+OBJECT_OPTIONS="${TEST_OPTIONS} --testcase-timeout=3600 --suite-timeout=3600 --suite=objects --do-test=objects_falcon"
 
 LOG=${WORK_CURRENT}/all_tests_run_${LOG_SUFFIX}
 BUILD_LOG=${WORK}/build_log_${LOG_SUFFIX}
@@ -107,6 +108,7 @@ if [ -a $CONTROL ]; then
 
     if [ $LOG_SUFFIX = 'walldorf' ]; then
         perl $MYSQL_TEST $BIG_TEST_OPTIONS >> ${LOG}_opt.log
+        perl $MYSQL_TEST $OBJECT_OPTIONS >> ${LOG}_opt.log
     fi
 else
     TIMESTAMP=$(date +%Y-%m-%d)