diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-09-01 07:55:07 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2021-09-01 07:56:37 +0000 |
| commit | 473a300827fed0abff85a3c336c66825f612ab59 (patch) | |
| tree | b51fc9bc91c175505a823b7cf664ddb86c81c8a3 /tcwg_gnu-build.sh | |
| parent | 03e5e2ec7bb876fa5781d90f6dd0666b054483ec (diff) | |
tcwg_gnu-build.sh: Conserve disk space in artifacts
... by removing top-level console.log, which is too huge to be useful,
and by compressing per-step console.log files.
Also don't generate results with compare_tests when we have only
partial results. It outputs a lot of missing PASSes and other
expected differences due to a partial run.
Change-Id: I3a29698fe3f6dccc844c0bf3b6034b013533377a
Diffstat (limited to 'tcwg_gnu-build.sh')
| -rwxr-xr-x | tcwg_gnu-build.sh | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/tcwg_gnu-build.sh b/tcwg_gnu-build.sh index 588a9c5f..892a2662 100755 --- a/tcwg_gnu-build.sh +++ b/tcwg_gnu-build.sh @@ -132,18 +132,6 @@ no_regression_p () # We use our modified version of GCC's comparison script clone_or_update_repo gcc-compare-results master https://git.linaro.org/toolchain/gcc-compare-results.git - # (defined by init_step in jenkins-helpers) - # shellcheck disable=SC2154 - gcc-compare-results/compare_tests -compr none -pass-thresh 0.9 \ - $sumfiles_base $sumfiles_new \ - | tee $run_step_artifacts/results.compare1 & - res=0 && wait $! || res=$? - - local xfail="gcc-compare-results/contrib/testsuite-management/flaky" - if [ -f "$xfail/${rr[ci_project]}-${rr[ci_config]}.xfail" ]; then - xfail="$xfail/${rr[ci_project]}-${rr[ci_config]}" - fi - local ignore_ERRORs_opt="" if [ ${#runtestflags[@]} != 0 ] \ || { [ x"${rr[mode]}" = x"baseline" ] \ @@ -156,27 +144,41 @@ no_regression_p () # (rr[mode]=baseline, rr[update_baseline]=push) so that ERRORs # don't creep into automatically-generated flaky XFAILs. ignore_ERRORs_opt="--ignore_ERRORs" + echo "NOT COMPARING PARTIAL RESULTS" \ + > $run_step_artifacts/results.compare2 + else + # Compare results using compare_tests only when we compare complete + # testsuites. + # (defined by init_step in jenkins-helpers) + # shellcheck disable=SC2154 + gcc-compare-results/compare_tests -compr none -pass-thresh 0.9 \ + $sumfiles_base $sumfiles_new \ + | tee $run_step_artifacts/results.compare2 & + res=0 && wait $! || res=$? + fi + + local xfail="gcc-compare-results/contrib/testsuite-management/flaky" + if [ -f "$xfail/${rr[ci_project]}-${rr[ci_config]}.xfail" ]; then + xfail="$xfail/${rr[ci_project]}-${rr[ci_config]}" fi gcc-compare-results/contrib/testsuite-management/validate_failures.py \ --manifest=$xfail.xfail --clean_build=$sumfiles_base \ --build_dir=$sumfiles_new $ignore_ERRORs_opt \ - | tee $run_step_artifacts/results.compare2 & + | tee $run_step_artifacts/results.compare & res=0 && wait $! || res=$? if [ $res != 0 ]; then local reg_lines - for i in 1 2; do - reg_lines=$(cat $run_step_artifacts/results.compare$i | wc -l) - reg_lines=$(($reg_lines-100)) - cat $run_step_artifacts/results.compare$i | sed -e "s/^/# /" \ - | (head -n100; cat >/dev/null) \ - > $run_step_artifacts/results.regressions - if [ $reg_lines -gt 0 ]; then - echo "# ... and $reg_lines more entries" \ - >> $run_step_artifacts/results.regressions - fi - done + reg_lines=$(cat $run_step_artifacts/results.compare | wc -l) + reg_lines=$(($reg_lines-100)) + cat $run_step_artifacts/results.compare | sed -e "s/^/# /" \ + | (head -n100; cat >/dev/null) \ + > $run_step_artifacts/results.regressions + if [ $reg_lines -gt 0 ]; then + echo "# ... and $reg_lines more entries" \ + >> $run_step_artifacts/results.regressions + fi if [ $res = 2 ]; then # Result comparison found regressions (exit code 2) |