From: Oleg Drokin Date: Sat, 26 Feb 2011 01:55:40 +0000 (-0800) Subject: Merge "b=24413 fix for automake > 1.9.6" X-Git-Tag: 2.0.59-llnl2-base~24 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b8eeb3cf4ed27f41e823aa3b38d03bf752b02033;hp=7e951a67a42423a6f00ce49c841c3872ceeb0bf6 Merge "b=24413 fix for automake > 1.9.6" --- diff --git a/lustre/tests/auster b/lustre/tests/auster old mode 100644 new mode 100755 index ff29a4c..716a934 --- a/lustre/tests/auster +++ b/lustre/tests/auster @@ -13,7 +13,7 @@ set -e export TF_FAIL=/tmp/tf.fail usage() { - cat < $LOGDIR/$log_name 2>&1 -# run_suite $suite_name $suite_script "${!suite_only}" 2>&1 |tee $LOGDIR/$log_name + if $verbose; then + run_suite $suite_name $suite_script "${!suite_only}" 2>&1 |tee $LOGDIR/$log_name + else + run_suite $suite_name $suite_script "${!suite_only}" > $LOGDIR/$log_name 2>&1 + fi } # # Add this to test-framework somewhere. reset_logging() { - export LOGDIR=${1:-/tmp/test_logs/$(date +%Y-%m-%d)/$(date +%H%M%S)} + export LOGDIR=${1:-${test_logs_dir}/$(date +%Y-%m-%d)/$(date +%H%M%S)} unset YAML_LOG init_logging } @@ -286,13 +280,27 @@ run_suites() { run_suite_logged $suite || RC=$? echo $suite returned $RC done - if [ $logging = true ]; then - ./maloo_upload.sh $LOGDIR + if $upload_logs; then + $upload_script fi n=$((n + 1)) done } +if [ $upload_logs = true ] ; then + upload_script=$(find_script_in_path maloo_upload.sh $PATH:$LUSTRE/tests) + if [[ -z $upload_script ]]; then + echo "Can't find maloo_upload.sh script" + exit 1 + fi + + if [ ! -r ~/.maloorc ] ; then + echo "A ~/.maloorc file is required in order to upload results." + echo "Visit your maloo web interface to download your .maloorc file" + exit 1 + fi +fi + export NAME MOUNT START CLEAN . ${CONFIG:-$LUSTRE/tests/cfg/$NAME.sh}