diff options
| -rwxr-xr-x | round-robin-bisect.sh | 4 | ||||
| -rw-r--r-- | round-robin.sh | 11 | ||||
| -rwxr-xr-x | tcwg_bmk-build.sh | 4 | ||||
| -rwxr-xr-x | tcwg_gnu-build.sh | 3 | ||||
| -rwxr-xr-x | tcwg_kernel-build.sh | 6 |
5 files changed, 8 insertions, 20 deletions
diff --git a/round-robin-bisect.sh b/round-robin-bisect.sh index efd7a8f9..f96ce675 100755 --- a/round-robin-bisect.sh +++ b/round-robin-bisect.sh @@ -500,10 +500,6 @@ Could not identify regression in *$current_project* in CI configuration ${rr[ci_ EOF fi -# Include error logs -cat $artifacts/build-$bad_sha1/regressions.txt | tee -a $artifacts/jenkins/mail-body.txt - - if [ x"${JIRA_PASSWORD+set}" = x"set" -a -f $artifacts/first-bad ]; then case "${rr[ci_project]}/${rr[ci_config]}" in tcwg_kernel/gnu-*) jira_card="GNU-587" ;; diff --git a/round-robin.sh b/round-robin.sh index 5301f447..c1884190 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -486,9 +486,9 @@ no_build_regression_p () # - "^ERROR:" detects linker errors # - ": undefined reference" detects missing symbols during linking # - "] Error " detects GNU make errors - cat > $run_step_artifacts/regressions.txt <<EOF -First few build errors in logs: -$(cat $new_artifacts/console.log | sed -e 's/"[^"]*"//g' | grep " error:\|^ERROR:\|: undefined reference\|\] Error " | head) + cat > $run_step_artifacts/results.regressions <<EOF +# First few build errors in logs: +$(cat $new_artifacts/console.log | sed -e 's/"[^"]*"//g' | grep " error:\|^ERROR:\|: undefined reference\|\] Error " | head | sed -e "s/^/# /") EOF if [ $build_result_new -lt $build_result_ref ]; then @@ -531,11 +531,6 @@ check_regression () return fi - if [ -f $run_step_artifacts/regressions.txt ]; then - # Add regression info generated by no_regression_p to top-level. - cp $run_step_artifacts/regressions.txt ${rr[top_artifacts]}/ - fi - if [ -f $run_step_artifacts/results.regressions ]; then # Add regression info generated by no_regression_p to top-level # results file. diff --git a/tcwg_bmk-build.sh b/tcwg_bmk-build.sh index 3fd24129..d09c45bb 100755 --- a/tcwg_bmk-build.sh +++ b/tcwg_bmk-build.sh @@ -388,7 +388,6 @@ no_regression_vs_p () # a regression. status=0 prev_bmk="" - echo "" > $run_step_artifacts/regressions.txt # Delete results.regressions generated by compare_results() calls above. rm -f $run_step_artifacts/results.regressions while IFS=, read -a arr; do @@ -396,7 +395,6 @@ no_regression_vs_p () symbol=${arr[1]} result=${arr[2]} if ! [ "$result" -le "5000" ]; then - echo "Regression in $bmk,$symbol" | tee -a $run_step_artifacts/regressions.txt echo "# $bmk,$symbol regressed" >> $run_step_artifacts/results.regressions status=1 if [ x"$bmk" != x"$prev_bmk" ]; then @@ -442,10 +440,8 @@ no_regression_to_base_p () # a regression. status=0 prev_bmk="" - echo "" > $run_step_artifacts/regressions.txt while IFS=, read -r bmk symbol result; do if ! [ "$result" -le "50" ]; then - echo "Regression in $bmk,$symbol" | tee -a $run_step_artifacts/regressions.txt status=1 if [ x"$bmk" != x"$prev_bmk" ]; then bisect_bmks+=("++benchmarks" "$bmk") diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index a81b2076..6a93948c 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -105,7 +105,8 @@ no_regression_p () # We use GCC's comparison script, so make sure we have a copy (may # not be the case when we are just checking binutils) clone_or_update_repo gcc master git://gcc.gnu.org/git/gcc.git - gcc/contrib/compare_tests $sumfiles_base $sumfiles_new | tee $run_step_artifacts/regressions.txt & + gcc/contrib/compare_tests $sumfiles_base $sumfiles_new \ + | sed -e "s/^/# /" | tee $run_step_artifacts/results.regressions & res=0 && wait $! || res=$? if [ $res -ne 0 ]; then diff --git a/tcwg_kernel-build.sh b/tcwg_kernel-build.sh index bb68a52a..af8f8514 100755 --- a/tcwg_kernel-build.sh +++ b/tcwg_kernel-build.sh @@ -229,9 +229,9 @@ no_regression_p () # - "^ERROR:" detects linker errors # - ": undefined reference" detects missing symbols during linking # - "] Error " detects GNU make errors - cat > $run_step_artifacts/regressions.txt <<EOF -First few build errors in logs: -$(cat $new_artifacts/console.log | sed -e 's/"[^"]*"//g' | grep " error:\|^ERROR:\|: undefined reference\|\] Error " | head) + cat > $run_step_artifacts/results.regressions <<EOF +# First few build errors in logs: +$(cat $new_artifacts/console.log | sed -e 's/"[^"]*"//g' | grep " error:\|^ERROR:\|: undefined reference\|\] Error " | head | sed -e "s/^/# /") EOF case "$linux_n_obj:$base_linux_n_obj" in |