diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-12-21 13:03:50 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2012-12-25 21:53:47 +0100 |
| commit | cf5aae8f3eec0cda704414dbe19d37373d9efc08 (patch) | |
| tree | 8c0083ca123d4f8d6219a66a8aef5bcdf9850473 | |
| parent | b0f9213bfc9bd7045c1c5a608aa9446c1d5f8a08 (diff) | |
remove remaining mentions of build_error.log
I'ts been removed in LO master, and at least false negatives detection
here still depended on it.
| -rw-r--r-- | README.tinbuild2 | 2 | ||||
| -rw-r--r-- | bin/tinbuild_internals.sh | 15 | ||||
| -rw-r--r-- | bin/tinbuild_phases.sh | 6 |
3 files changed, 6 insertions, 17 deletions
diff --git a/README.tinbuild2 b/README.tinbuild2 index 6ebe9df..f197f3f 100644 --- a/README.tinbuild2 +++ b/README.tinbuild2 @@ -94,7 +94,7 @@ a test email is send to the owner declared in the config file. Due to the existance of build-time heisenbug, that seems related to bugs in the underlying OS/file-system/... I've added a mechanism to intercept these and prevent sending false negative reports. this is done by grepping -the build_error.log produced by the build against a file containing a +the log produced by the build against a file containing a list of known heisenbug signature. if there is a match no email is sent and the build is retried immediatly on the same tree. The list of signature being highly machine dependant (and hopefully empty for diff --git a/bin/tinbuild_internals.sh b/bin/tinbuild_internals.sh index 2150983..d1decc8 100644 --- a/bin/tinbuild_internals.sh +++ b/bin/tinbuild_internals.sh @@ -885,12 +885,7 @@ run_tb_gerrit_loop() printf "${report_msgs?}:\n\n" > report_error.log echo "======" >> report_error.log if [ "${report_log?}" == "tb_${B}_build.log" ] ; then - if [ -f build_error.log ]; then - cat build_error.log | grep -C10 "^[^[]" >> report_error.log - tail -n50 ${report_log?} | grep -A25 'internal build errors' | grep 'ERROR:' >> report_error.log - else - tail -n1000 ${report_log?} >> report_error.log - fi + tail -n1000 ${report_log?} >> report_error.log else cat ${report_log?} >> report_error.log fi @@ -1046,13 +1041,7 @@ run_tb_loop() printf "${report_msgs?}:\n\n" > report_error.log echo "======" >> report_error.log if [ "${report_log?}" == "tb_${B}_build.log" ] ; then - if [ -f build_error.log ]; then - cat build_error.log | grep -C10 "^[^[]" >> report_error.log - tail -n50 ${report_log?} | grep -A25 'internal build errors' | grep 'ERROR:' >> report_error.log - else - tail -n1000 ${report_log?} >> report_error.log - fi - + tail -n1000 ${report_log?} >> report_error.log else cat ${report_log?} >> report_error.log fi diff --git a/bin/tinbuild_phases.sh b/bin/tinbuild_phases.sh index 76b877d..6c1adbf 100644 --- a/bin/tinbuild_phases.sh +++ b/bin/tinbuild_phases.sh @@ -29,7 +29,7 @@ do_autogen() pre_clean() { if [ "${retval}" = "0" ] ; then - rm -f build_error.log + true # log files to clean, if any fi } @@ -86,9 +86,9 @@ do_test() post_make() { if [ "${retval}" != "0" ] ; then - if [ -f build_error.log ] ; then + if [ -f "${report_log?}" ] ; then if [ -f $HOME/.tinbuild/config/${PROFILE_NAME?}.false_negatives ] ; then - grep -F "$(cat $HOME/.tinbuild/config/${PROFILE_NAME?}.false_negatives)" build_error.log && retval="false_negative" + grep -F "$(cat $HOME/.tinbuild/config/${PROFILE_NAME?}.false_negatives)" "${report_log?}" && retval="false_negative" if [ "${retval?}" == "false_negative" ] ; then log_msgs "False negative detected" fi |