#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/
268 Hakan Kuecuekyilmaz 2008-09-15
Code cleanup. Use ${VAR} in appropriate places.
modified:
weekly_falcon_test_overview/analyze_all_test_runs.sh
weekly_falcon_test_overview/include/apply_patches.inc
weekly_falcon_test_overview/include/hostnames.inc
weekly_falcon_test_overview/mount_nfs.sh
weekly_falcon_test_overview/umount_nfs.sh
weekly_falcon_test_overview/wait_and_shutdown.sh
weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh
weekly_falcon_test_overview/weekly_falcon_test_overview.php
weekly_falcon_test_overview/weekly_test_overview.sh
per-file messages:
weekly_falcon_test_overview/analyze_all_test_runs.sh
Code cleanup. Use ${VAR} in appropriate places.
weekly_falcon_test_overview/include/apply_patches.inc
Code cleanup. Use ${VAR} in appropriate places.
weekly_falcon_test_overview/include/hostnames.inc
We use short hostnames now ("hostname -s").
weekly_falcon_test_overview/mount_nfs.sh
Code cleanup. Use ${VAR} in appropriate places.
weekly_falcon_test_overview/umount_nfs.sh
Code cleanup. Use ${VAR} in appropriate places.
Also use $(hostname -s) instead of $(hostname).
weekly_falcon_test_overview/wait_and_shutdown.sh
Code cleanup.
weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh
Code cleanup. Use ${VAR} in appropriate places.
weekly_falcon_test_overview/weekly_falcon_test_overview.php
We use short hostnames now ("hostname -s").
Reworked plain text statistic output to use printf()
for better c&p in emails.
weekly_falcon_test_overview/weekly_test_overview.sh
Code cleanup.
=== modified file 'weekly_falcon_test_overview/analyze_all_test_runs.sh'
--- a/weekly_falcon_test_overview/analyze_all_test_runs.sh 2008-07-16 18:08:23 +0000
+++ b/weekly_falcon_test_overview/analyze_all_test_runs.sh 2008-09-15 20:58:01 +0000
@@ -28,15 +28,15 @@ source include/hostnames.inc
#
# Directories.
#
-WORK="$HOME/work/mysql"
-WORK_CURRENT="$WORK/current_weekly_falcon_test_overview_logs"
-WORK_OLD="$WORK/old_weekly_falcon_test_overview_logs"
+WORK="${HOME}/work/mysql"
+WORK_CURRENT="${WORK}/current_weekly_falcon_test_overview_logs"
+WORK_OLD="${WORK}/old_weekly_falcon_test_overview_logs"
LOCAL_REPOSITORY='mysql-6.0-falcon'
-TEST_DIR="$WORK/$LOCAL_REPOSITORY/mysql-test/suite/falcon/t"
-TEAM_TEST_DIR="$WORK/$LOCAL_REPOSITORY/mysql-test/suite/falcon_team/t"
+TEST_DIR="${WORK}/${LOCAL_REPOSITORY}/mysql-test/suite/falcon/t"
+TEAM_TEST_DIR="${WORK}/${LOCAL_REPOSITORY}/mysql-test/suite/falcon_team/t"
-BZR_DIR="$HOME/work/mysql-falcon/weekly_falcon_test_overview"
+BZR_DIR="${HOME}/work/mysql-falcon/weekly_falcon_test_overview"
DESTINATION="hakank@stripped:~/public_html"
#
@@ -49,67 +49,72 @@ OPT_SUFFIX='opt.log'
#
# Files
#
-RUN_TIMES="$BZR_DIR/weekly_falcon_test_overview_runtime.txt"
+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="falcon.css \
-$WORK_CURRENT/disabled_tests.txt \
-$WORK_CURRENT/falcon_team_tests.txt \
+${WORK_CURRENT}/disabled_tests.txt \
+${WORK_CURRENT}/falcon_team_tests.txt \
weekly_falcon_test_overview.php \
weekly_falcon_test_overview.png \
weekly_falcon_test_overview.txt \
weekly_falcon_test_overview_runtime.txt \
-$WORK_CURRENT/all_tests_in_repository.log \
-$WORK/all_tests_run*"
-OLD_FILES_TO_SCP="$WORK_OLD/all_tests*"
+${WORK_CURRENT}/all_tests_in_repository.log \
+${WORK}/all_tests_run*"
+OLD_FILES_TO_SCP="${WORK_OLD}/all_tests*"
#
# Generate list of existing Falcon tests from bzr repository.
#
-rm $WORK_CURRENT/$ALL_TESTS_IN_REPOSITORY'.log'
-ls $TEST_DIR/*.test | while read i
-do
- basename $i | awk -F . '{ print $1 }' >> $WORK_CURRENT/$ALL_TESTS_IN_REPOSITORY'.log'
+rm ${WORK_CURRENT}/${ALL_TESTS_IN_REPOSITORY}.log
+ls ${TEST_DIR}/*.test | while read i
+ do
+ basename $i | awk -F . '{ print $1 }' >> ${WORK_CURRENT}/${ALL_TESTS_IN_REPOSITORY}.log
done
-ls $TEAM_TEST_DIR/*.test | while read i
-do
- basename $i | awk -F . '{ print $1 }' >> $WORK_CURRENT/$ALL_TESTS_IN_REPOSITORY'.log'
+ls ${TEAM_TEST_DIR}/*.test | while read i
+ do
+ basename $i | awk -F . '{ print $1 }' >> ${WORK_CURRENT}/${ALL_TESTS_IN_REPOSITORY}.log
done
#
# Generate a list of tests in falcon_team suite.
#
-rm $WORK_CURRENT/falcon_team_tests.txt
-ls $TEAM_TEST_DIR/*.test | while read i
-do
- basename $i | awk -F . '{ print $1 }' >> $WORK_CURRENT/falcon_team_tests.txt
+rm ${WORK_CURRENT}/falcon_team_tests.txt
+ls ${TEAM_TEST_DIR}/*.test | while read i
+ do
+ basename $i | awk -F . '{ print $1 }' >> ${WORK_CURRENT}/falcon_team_tests.txt
done
#
# Generate list of disabled Falcon tests.
#
-cat $TEST_DIR/$DISABLED_TESTS | grep -v -e '^#' | awk '{ print $1 }' > $WORK_CURRENT/disabled_tests.txt
-cat $TEAM_TEST_DIR/$DISABLED_TESTS | grep -v -e '^#' | awk '{ print $1 }' >> $WORK_CURRENT/disabled_tests.txt
+cat ${TEST_DIR}/${DISABLED_TESTS} | grep -v -e '^#' | awk '{ print $1 }' > ${WORK_CURRENT}/disabled_tests.txt
+cat ${TEAM_TEST_DIR}/${DISABLED_TESTS} | grep -v -e '^#' | awk '{ print $1 }' >> ${WORK_CURRENT}/disabled_tests.txt
#
# Backup old files.
# Get date from any of the log files.
#
-ls $WORK/$LOG_NAME_PREFIX* | while read i
-do
+ls ${WORK}/${LOG_NAME_PREFIX}* | while read i
+ do
OLD_DATE=$(ls -l --time-style="+%Y-%m-%d" $i | awk '{ print $6 }')
# Copy log files to $WORK_OLD for reference.
for i in $HOSTNAMES
- do
- cp $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX $WORK_OLD/$LOG_NAME_PREFIX'_'$i'_'$OLD_DATE'_'$DEBUG_SUFFIX
- cp $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX $WORK_OLD/$LOG_NAME_PREFIX'_'$i'_'$OLD_DATE'_'$OPT_SUFFIX
- cp $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX'.processed' $WORK_OLD/$LOG_NAME_PREFIX'_'$i'_'$OLD_DATE'_'$DEBUG_SUFFIX'.processed'
- cp $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX'.processed' $WORK_OLD/$LOG_NAME_PREFIX'_'$i'_'$OLD_DATE'_'$OPT_SUFFIX'.processed'
+ do
+ cp ${WORK}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX} \
+ ${WORK_OLD}/${LOG_NAME_PREFIX}_${i}_${OLD_DATE}_${DEBUG_SUFFIX}
+ cp ${WORK}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX} \
+ ${WORK_OLD}/${LOG_NAME_PREFIX}_${i}_${OLD_DATE}_${OPT_SUFFIX}
+ cp ${WORK}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX}.processed \
+ ${WORK_OLD}/${LOG_NAME_PREFIX}_${i}_${OLD_DATE}_${DEBUG_SUFFIX}.processed
+ cp ${WORK}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX}.processed \
+ ${WORK_OLD}/${LOG_NAME_PREFIX}_${i}_${OLD_DATE}_${OPT_SUFFIX}.processed
done
- cp $WORK/$ALL_TESTS_IN_REPOSITORY'.log' $WORK_OLD/$ALL_TESTS_IN_REPOSITORY'_'$OLD_DATE'.log'
+ cp ${WORK}/${ALL_TESTS_IN_REPOSITORY}.log \
+ ${WORK_OLD}/${ALL_TESTS_IN_REPOSITORY}_${OLD_DATE}.log
break
done
@@ -118,21 +123,23 @@ done
# Process current log files. Also remove test case suite prefix.
#
for i in $HOSTNAMES
-do
- cp $WORK_CURRENT/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX
- cp $WORK_CURRENT/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX
+ do
+ cp ${WORK_CURRENT}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX} \
+ ${WORK}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX}
+ cp ${WORK_CURRENT}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX} \
+ ${WORK}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX}
- grep falcon $WORK_CURRENT/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX | grep "\[" | awk -F ] '{ print $1 "]" }' | awk -F . '{ print $2 }' > $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX'.processed'
- grep falcon $WORK_CURRENT/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX | grep "\[" | awk -F ] '{ print $1 "]" }' | awk -F . '{ print $2 }' > $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX'.processed'
+ grep falcon ${WORK_CURRENT}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX} | grep "\[" | awk -F ] '{ print $1 "]" }' | awk -F . '{ print $2 }' > ${WORK}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX}.processed
+ grep falcon ${WORK_CURRENT}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX} | grep "\[" | awk -F ] '{ print $1 "]" }' | awk -F . '{ print $2 }' > ${WORK}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX}.processed
done
-cp $WORK_CURRENT/$ALL_TESTS_IN_REPOSITORY'.log' $WORK/$ALL_TESTS_IN_REPOSITORY'.log'
+cp ${WORK_CURRENT}/${ALL_TESTS_IN_REPOSITORY}.log ${WORK}/${ALL_TESTS_IN_REPOSITORY}.log
#
# Calculate run time of debug build.
#
DATE=$(date +%Y-%m-%d)
-SPENT_64=$(grep -e "^Spent " $WORK/$LOG_NAME_PREFIX'_'walldorf'_'$DEBUG_SUFFIX | awk '{ print $2 }')
+SPENT_64=$(grep -e "^Spent " ${WORK}/${LOG_NAME_PREFIX}_walldorf_${DEBUG_SUFFIX} | awk '{ print $2 }')
if [ $DEBUG = 1 ]; then
# echo $SPENT_32
@@ -150,25 +157,25 @@ fi
LOG_FILES=0
for i in $HOSTNAMES
do
- if [[ -f $WORK/$LOG_NAME_PREFIX'_'$i'_'$DEBUG_SUFFIX || -f $WORK/$LOG_NAME_PREFIX'_'$i'_'$OPT_SUFFIX ]]; then
+ if [[ -f ${WORK}/${LOG_NAME_PREFIX}_${i}_${DEBUG_SUFFIX} || -f ${WORK}/${LOG_NAME_PREFIX}_${i}_${OPT_SUFFIX} ]]; then
LOG_FILES=1
fi
- 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 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)
+ 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)
PERCENT_DEBUG=$(php -r 'echo round(($_ENV["TESTS_DEBUG"] - $_ENV["FAILED_DEBUG"]) / $_ENV["TESTS_DEBUG"] * 100, 2);')
PERCENT_OPT=$(php -r 'echo round(($_ENV["TESTS_OPT"] - $_ENV["FAILED_OPT"]) / $_ENV["TESTS_OPT"] * 100, 2);')
- echo "$DATE $i debug build: Failed $FAILED_DEBUG/$TESTS_DEBUG tests, $PERCENT_DEBUG% were successful." >> $BZR_DIR/weekly_falcon_test_overview.txt
- echo "$DATE $i opt build: Failed $FAILED_OPT/$TESTS_OPT tests, $PERCENT_OPT% were successful." >> $BZR_DIR/weekly_falcon_test_overview.txt
+ echo "$DATE $i debug build: Failed ${FAILED_DEBUG}/${TESTS_DEBUG} tests, ${PERCENT_DEBUG}% were successful." >> ${BZR_DIR}/weekly_falcon_test_overview.txt
+ echo "$DATE $i opt build: Failed ${FAILED_OPT}/${TESTS_OPT} tests, ${PERCENT_OPT}% were successful." >> ${BZR_DIR}/weekly_falcon_test_overview.txt
done
if [ $LOG_FILES = 0 ]; then
- echo '[ERROR] We have no log files at all. Exiting!'
+ echo '[ERROR]: We have no log files at all. Exiting!'
exit 1
fi
@@ -186,4 +193,4 @@ fi
# Copy log files to production.
#
scp -p -q $FILES_TO_SCP $DESTINATION
-scp -p -q $OLD_FILES_TO_SCP $DESTINATION/old_weekly_falcon_test_overview_logs
+scp -p -q $OLD_FILES_TO_SCP ${DESTINATION}/old_weekly_falcon_test_overview_logs
=== modified file 'weekly_falcon_test_overview/include/apply_patches.inc'
--- a/weekly_falcon_test_overview/include/apply_patches.inc 2008-01-31 22:52:23 +0000
+++ b/weekly_falcon_test_overview/include/apply_patches.inc 2008-09-15 20:58:01 +0000
@@ -7,20 +7,20 @@
#
# Directories.
#
-AP_WORK="$HOME/walldorf/mysql"
-AP_PATCHES="$AP_WORK/patches/falcon/$(hostname)"
+AP_WORK="${HOME}/walldorf/mysql"
+AP_PATCHES="${AP_WORK}/patches/falcon/$(hostname -s)"
apply_patches ()
{
- for i in $AP_PATCHES/*
+ for i in ${AP_PATCHES}/*
do
patch -tN --dry-run -p1 < $i
if [ $? -ne 0 ]; then
- echo "[ERROR PATCH] Patch dry run of $i failed."
+ echo "[ERROR PATCH]: Patch dry run of $i failed."
else
patch -tN -p1 < $i
if [ $? -ne 0 ]; then
- echo "[ERROR PATCH] Patch $i failed."
+ echo "[ERROR PATCH]: Patch $i failed."
fi
fi
done
=== modified file 'weekly_falcon_test_overview/include/hostnames.inc'
--- a/weekly_falcon_test_overview/include/hostnames.inc 2008-05-23 14:00:49 +0000
+++ b/weekly_falcon_test_overview/include/hostnames.inc 2008-09-15 20:58:01 +0000
@@ -4,4 +4,4 @@
# Hakan Kuecuekyilmaz, <hakan at mysql dot com>, 2007-12-14.
# $Id$
-HOSTNAMES='walldorf ubuntu32x2 win64 esslingen.local'
+HOSTNAMES='walldorf ubuntu32x2 win64 esslingen'
=== modified file 'weekly_falcon_test_overview/mount_nfs.sh'
--- a/weekly_falcon_test_overview/mount_nfs.sh 2008-02-28 23:14:45 +0000
+++ b/weekly_falcon_test_overview/mount_nfs.sh 2008-09-15 20:58:01 +0000
@@ -10,10 +10,9 @@ source include/gnu_path.inc
SERVER='walldorf'
PREFIX=$(echo ~hakan)
REMOTE_DIR='/home/hakan/work'
-LOCAL_DIR="$PREFIX/walldorf"
+LOCAL_DIR="${PREFIX}/walldorf"
# Check whether remote server is up.
-
i=0
false
while ( [ $? -ne 0 ] )
@@ -22,9 +21,9 @@ while ( [ $? -ne 0 ] )
sleep 3
if [ $i -eq 120 ]; then
- echo "Could not ping $SERVER"
+ echo "[ERROR]: Could not ping ${SERVER}"
exit 1;
fi
done
-mount $SERVER:$REMOTE_DIR $LOCAL_DIR
+mount ${SERVER}:${REMOTE_DIR} $LOCAL_DIR
=== modified file 'weekly_falcon_test_overview/umount_nfs.sh'
--- a/weekly_falcon_test_overview/umount_nfs.sh 2008-02-28 23:14:45 +0000
+++ b/weekly_falcon_test_overview/umount_nfs.sh 2008-09-15 20:58:01 +0000
@@ -8,16 +8,17 @@
source include/gnu_path.inc
PREFIX=$(echo ~hakan)
-NFS_DIR="$PREFIX/walldorf"
+NFS_DIR="${PREFIX}/walldorf"
#
# Directories.
#
-WORK="$PREFIX/work/mysql/wfto"
+WORK="${PREFIX}/work/mysql/wfto"
#
# Files.
-CONTROL=$WORK/$(hostname).done
+#
+CONTROL=${WORK}/$(hostname -s).done
#
# Timing.
@@ -27,11 +28,11 @@ DURATION=$((5 * 60 * 60))
UNTIL=$(($START + $DURATION))
while (! [ -a $CONTROL ] )
-do
+ do
sleep 30
done
rm -f $CONTROL
sleep 3
-umount $NFS_DIR
\ No newline at end of file
+umount $NFS_DIR
=== modified file 'weekly_falcon_test_overview/wait_and_shutdown.sh'
--- a/weekly_falcon_test_overview/wait_and_shutdown.sh 2008-06-19 14:57:35 +0000
+++ b/weekly_falcon_test_overview/wait_and_shutdown.sh 2008-09-15 20:58:01 +0000
@@ -9,7 +9,7 @@
# Check arguments.
if [ $# -ne 1 ]; then
- echo '[ERROR] Please provide exactly 1 argument.'
+ echo '[ERROR]: Please provide exactly 1 argument.'
echo "Example: $0 <prefix_to_users_home_directory>"
echo "Example: $0 /Users/hakan"
exit 1;
=== 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-09-12 05:52:29 +0000
+++ b/weekly_falcon_test_overview/wait_for_mysql_test_and_collect.sh 2008-09-15 20:58:01 +0000
@@ -20,8 +20,8 @@ GRAPH='weekly_falcon_test_overview.png'
#
# Directories.
#
-WORK="$HOME/work"
-BZR_DIR="$WORK/mysql-falcon/weekly_falcon_test_overview"
+WORK="${HOME}/work"
+BZR_DIR="${WORK}/mysql-falcon/weekly_falcon_test_overview"
#
# Email addresses and text.
@@ -50,11 +50,11 @@ UNTIL=$(($START + $DURATION))
for i in $HOSTNAMES
do
- while (! [ -a $WORK/mysql/$i.done ] )
+ while (! [ -a ${WORK}/mysql/${i}.done ] )
do
if [ $UNTIL -lt $(date +%s) ]; then
- echo "Wait time exceeded."
- echo "Waited $DURATION seconds for $WORK/$i.done. Exiting."
+ echo "[ERROR]: Wait time exceeded."
+ echo "Waited $DURATION seconds for ${WORK}/${i}.done. Exiting."
exit 1
fi
sleep 30
@@ -71,10 +71,10 @@ fi
for i in $HOSTNAMES
do
- rm $WORK/mysql/$i.done
+ rm ${WORK}/mysql/${i}.done
done
-# Mail status
+# Mail out status report.
if [ $? != 0 ]; then
echo $FAILED | mailx -s '[WFTO ERROR]' $MAINTAINER_EMAIL
else
=== modified file 'weekly_falcon_test_overview/weekly_falcon_test_overview.php'
--- a/weekly_falcon_test_overview/weekly_falcon_test_overview.php 2008-09-12 05:57:19 +0000
+++ b/weekly_falcon_test_overview/weekly_falcon_test_overview.php 2008-09-15 20:58:01 +0000
@@ -21,11 +21,13 @@ if (DEBUG) {
/**
* Hostnames participating WFTO.
* Currently we run the test suite with debug and opt build of Falcon.
+ *
+ * Please keep this list of hostnames in sync with include/hostnames.inc.
*/
$hostnames[] = 'walldorf';
$hostnames[] = 'ubuntu32x2';
$hostnames[] = 'win64';
-$hostnames[] = 'esslingen.local';
+$hostnames[] = 'esslingen';
// Each host has debug build and opt build test run
// and a column for status icon.
@@ -516,6 +518,16 @@ for ($i = 0; $i < $reference_count; $i++
<div class="falcon">
<pre>
<?php
+$max_hostname = 0;
+foreach ($hostnames as $data) {
+ $tmp = strlen($data);
+ if ($max_hostname < $tmp) {
+ $max_hostname = $tmp;
+ }
+}
+// Add length of 'debug: '.
+$max_hostname += 7;
+
foreach ($hostnames as $hostname) {
$tests_debug = count_without_skipped($all_tests[$hostname . '_debug']);
if ($tests_debug == 0) {
@@ -531,8 +543,11 @@ foreach ($hostnames as $hostname) {
$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";
- echo ' ' . $hostname . ' opt: Failed ' . $failing[$hostname . '_opt'] . '/' . $tests_opt . ', ' . $per_cent_opt . '% were successful.' . "\n";
+ printf(' %-' . $max_hostname . 's' . ' %s %d/%d, %.2f%s' . "\n",
+ $hostname . ' debug:', 'Failed', $failing[$hostname . '_debug'], $tests_debug, $per_cent_debug, '% were successful.');
+
+ printf(' %-' . $max_hostname . 's' . ' %s %d/%d, %.2f%s' . "\n",
+ $hostname . ' opt:', 'Failed', $failing[$hostname . '_opt'], $tests_opt, $per_cent_opt, '% were successful.');
}
?>
</pre>
=== modified file 'weekly_falcon_test_overview/weekly_test_overview.sh'
--- a/weekly_falcon_test_overview/weekly_test_overview.sh 2008-09-04 14:21:32 +0000
+++ b/weekly_falcon_test_overview/weekly_test_overview.sh 2008-09-15 20:58:01 +0000
@@ -10,9 +10,9 @@
# Check arguments.
if [ $# -ne 3 ]; then
- echo '[ERROR] Please provide exactly 3 arguments.'
+ echo '[ERROR]: Please provide exactly 3 arguments.'
echo "Example: $0 <debug> <non-debug> <log_suffix>"
- echo "Example: $0 compile-pentium-debug-max compile-pentium-max \$(hostname)"
+ echo "Example: $0 compile-pentium-debug-max compile-pentium-max \$(hostname -s)"
exit 1;
else
DEBUG_BUILD=$1
@@ -80,9 +80,9 @@ if [ -a $CONTROL ]; then
apply_patches > $BUILD_LOG'_debug.log' 2>&1
BUILD/$DEBUG_BUILD >> $BUILD_LOG'_debug.log' 2>&1
if [ $? != 0 ]; then
- echo "[ERROR] $DEBUG_BUILD failed!"
+ echo "[ERROR]: $DEBUG_BUILD failed!"
else
- echo "[INFO] $DEBUG_BUILD was successful!"
+ echo "[INFO]: $DEBUG_BUILD was successful!"
fi
cd $TEST_DIR
@@ -97,9 +97,9 @@ if [ -a $CONTROL ]; then
BUILD/$OPT_BUILD > $BUILD_LOG'_opt.log' 2>&1
# Do we have a successful build?
if [ $? != 0 ]; then
- echo "[ERROR] $OPT_BUILD failed!"
+ echo "[ERROR]: $OPT_BUILD failed!"
else
- echo "[INFO] $OPT_BUILD was successful!"
+ echo "[INFO]: $OPT_BUILD was successful!"
fi
cd $TEST_DIR
@@ -110,7 +110,7 @@ if [ -a $CONTROL ]; then
fi
else
TIMESTAMP=$(date +%Y-%m-%d)
- echo '[ERROR] Clone on file server was not scucessful.' > $WORK/$LOG_SUFFIX-$TIMESTAMP.done
+ echo '[ERROR]: Clone on file server was not scucessful.' > $WORK/$LOG_SUFFIX-$TIMESTAMP.done
fi
TIMESTAMP=$(date +%Y-%m-%d)
| Thread |
|---|
| • bzr commit into mysql-falcon branch (hky:268) | Hakan Kuecuekyilmaz | 15 Sep |
