commit into MySQL/Falcon helper scripts, tests, and programs:mysql-falcon branch (hakan:193)

[Hakan Kuecuekyilmaz]

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

  193 Hakan Kuecuekyilmaz	2008-05-23
      Fixed minor calculation problem with [ skipped ] tests.
modified:
  weekly_falcon_test_overview/analyze_all_test_runs.sh
  weekly_falcon_test_overview/include/hostnames.inc
  weekly_falcon_test_overview/weekly_falcon_test_overview.php
  weekly_falcon_test_overview/weekly_test_overview.sh


=== modified file 'weekly_falcon_test_overview/analyze_all_test_runs.sh'
--- a/weekly_falcon_test_overview/analyze_all_test_runs.sh	2008-05-23 06:52:20 +0000
+++ b/weekly_falcon_test_overview/analyze_all_test_runs.sh	2008-05-23 14:00:49 +0000
@@ -52,13 +52,13 @@
 RUN_TIMES="$BZR_DIR/weekly_falcon_test_overview_runtime.txt"
 ALL_TESTS_IN_REPOSITORY='all_tests_in_repository'
 DISABLED_TESTS='disabled.def'
-FILES_TO_SCP="$WORK_CURRENT/falcon.css \
-disabled_tests.txt \
+FILES_TO_SCP="falcon.css \
+$WORK_CURRENT/disabled_tests.txt \
 weekly_falcon_test_overview.php \
 weekly_falcon_test_overview.png \
 weekly_falcon_test_overview.txt \
 weekly_falcon_test_overview_runtime.txt \
-$WORK/all_tests_in_repository.log \
+$WORK_CURRENT/all_tests_in_repository.log \
 $WORK/all_tests_run*"
 OLD_FILES_TO_SCP="$WORK_OLD/all_tests*"
 
@@ -119,10 +119,9 @@
 cp $WORK_CURRENT/$ALL_TESTS_IN_REPOSITORY'.log' $WORK/$ALL_TESTS_IN_REPOSITORY'.log'
 
 #
-# Calculate some run times of debug builds.
+# Calculate run time of debug build.
 #
 DATE=$(date +%Y-%m-%d)
-#SPENT_32=$(grep -e "^Spent " $WORK/$LOG_NAME_PREFIX'_'ubuntu32x1'_'$DEBUG_SUFFIX | awk
'{ print $2 }')
 SPENT_64=$(grep -e "^Spent " $WORK/$LOG_NAME_PREFIX'_'walldorf'_'$DEBUG_SUFFIX | awk '{
print $2 }')
 
 if [ $DEBUG = 1 ]; then
@@ -131,7 +130,6 @@
 else
     echo "" >> $RUN_TIMES
     echo $DATE >> $RUN_TIMES
-#    echo "  Linux 32-bit: $SPENT_32 seconds" >> $RUN_TIMES
     echo "  Linux 64-bit: $SPENT_64 seconds" >> $RUN_TIMES
 fi
 
@@ -146,8 +144,8 @@
         LOG_FILES=1
     fi
 
-    export TESTS_DEBUG=$(cat $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX'.processed' | wc
-l)
-    export TESTS_OPT=$(cat $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX'.processed' | wc -l)
+    export TESTS_DEBUG=$(cat $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX'.processed' |
grep -v "\[ skipped \]" | wc -l)
+    export TESTS_OPT=$(cat $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX'.processed' | grep
-v "\[ skipped \]" | wc -l)
 
     export FAILED_DEBUG=$(grep "\[ fail \]"
$WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX'.processed' | wc -l)
     export FAILED_OPT=$(grep "\[ fail \]"
$WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX'.processed' | wc -l)

=== modified file 'weekly_falcon_test_overview/include/hostnames.inc'
--- a/weekly_falcon_test_overview/include/hostnames.inc	2008-05-23 06:52:20 +0000
+++ b/weekly_falcon_test_overview/include/hostnames.inc	2008-05-23 14:00:49 +0000
@@ -4,4 +4,4 @@
 # Hakan Kuecuekyilmaz, <hakan at mysql dot com>, 2007-12-14.
 # $Id$
 
-HOSTNAMES='walldorf ubuntu32x2 esslingen.local win64'
+HOSTNAMES='walldorf ubuntu32x2 win64 esslingen.local'

=== modified file 'weekly_falcon_test_overview/weekly_falcon_test_overview.php'
--- a/weekly_falcon_test_overview/weekly_falcon_test_overview.php	2008-05-23 06:52:20
+0000
+++ b/weekly_falcon_test_overview/weekly_falcon_test_overview.php	2008-05-23 14:00:49
+0000
@@ -24,8 +24,8 @@
  */
 $hostnames[] = 'walldorf';
 $hostnames[] = 'ubuntu32x2';
+$hostnames[] = 'win64';
 $hostnames[] = 'esslingen.local';
-$hostnames[] = 'win64';
 
 // Each host has debug build and opt build test run
 // and a column for status icon.
@@ -91,6 +91,19 @@
     return $color;
 }
 
+function count_without_skipped($arr)
+{
+    $i = 0;
+
+    foreach ($arr as $data) {
+        if (!strstr('[ skipped ]', $data)) {
+            $i++;
+        }
+    }
+
+    return $i;
+}
+
 /**
  * Sample reference data of test names and disabled tests.
  */
@@ -408,9 +421,9 @@
     $file_prefix = ALL_TESTS_PREFIX . $hostname;
 
     echo '    <td colspan="2">
-      <a href="' . $file_prefix . '_debug.log" title="Link to full log file">' .
$hostname . '&ndash; debug</a></td>' . "\n";
+      <a href="' . $file_prefix . '_debug.log" title="Link to full log file">' .
str_replace('.local', '', $hostname) . '&ndash; debug</a></td>' . "\n";
     echo '    <td colspan="2">
-      <a href="' . $file_prefix . '_opt.log" title="Link to full log file">' .
$hostname . '&ndash; opt</a></td>' . "\n";
+      <a href="' . $file_prefix . '_opt.log" title="Link to full log file">' .
str_replace('.local', '', $hostname) . '&ndash; opt</a></td>' . "\n";
 }
 ?>
   </tr>
@@ -420,10 +433,10 @@
     <td>&nbsp;</td>
 <?php
 foreach ($hostnames as $hostname) {
-    $tests_debug = count($all_tests[$hostname . '_debug']);
+    $tests_debug = count_without_skipped($all_tests[$hostname . '_debug']);
     $per_cent_debug =  round(($tests_debug - $failing[$hostname . '_debug']) /
$tests_debug * 100, 2);
 
-    $tests_opt = count($all_tests[$hostname . '_opt']);
+    $tests_opt = count_without_skipped($all_tests[$hostname . '_opt']);
     $per_cent_opt =  round(($tests_opt - $failing[$hostname . '_opt']) / $tests_opt *
100, 2);
 
     echo '<td colspan="2">' .  $tests_debug . '/' . $failing[$hostname . '_debug']
. ' ' . $per_cent_debug . '%</td>';
@@ -450,10 +463,10 @@
 <pre>
 <?php
 foreach ($hostnames as $hostname) {
-    $tests_debug = count($all_tests[$hostname . '_debug']);
+    $tests_debug = count_without_skipped($all_tests[$hostname . '_debug']);
     $per_cent_debug =  round(($tests_debug - $failing[$hostname . '_debug']) /
$tests_debug * 100, 2);
 
-    $tests_opt = count($all_tests[$hostname . '_opt']);
+    $tests_opt = count_without_skipped($all_tests[$hostname . '_opt']);
     $per_cent_opt =  round(($tests_opt - $failing[$hostname . '_opt']) / $tests_opt *
100, 2);
 
     echo ' ' . $hostname . ' debug: Failed ' . $failing[$hostname . '_debug'] . '/' .
$tests_debug . ', ' . $per_cent_debug . ' were successful.' . "\n";

=== modified file 'weekly_falcon_test_overview/weekly_test_overview.sh'
--- a/weekly_falcon_test_overview/weekly_test_overview.sh	2008-05-21 17:14:51 +0000
+++ b/weekly_falcon_test_overview/weekly_test_overview.sh	2008-05-23 14:00:49 +0000
@@ -50,7 +50,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
--suite=falcon --do-test=.*-big"
+BIG_TEST_OPTIONS="$TEST_OPTIONS --big-test --suite-timeout=6360 --testcase-timeout=30
--do-test=.*-big"
 
 LOG=$WORK_CURRENT/'all_tests_run_'$LOG_SUFFIX
 BUILD_LOG=$WORK/'build_log_'$LOG_SUFFIX