The javascript console log messages are used in scraping, when converting an html test report to html email. Before this patch a console message indicating that all charts have been drawn was not correctly sent if the last test failed (or didn't have chart data for some other reason) which, in turn, caused oe-build-perf-report-email.py script to fail with a timeout.
Signed-off-by: Markus Lehtonen <markus.lehto...@linux.intel.com> --- scripts/lib/build_perf/html/measurement_chart.html | 6 +++--- scripts/lib/build_perf/html/report.html | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/lib/build_perf/html/measurement_chart.html b/scripts/lib/build_perf/html/measurement_chart.html index 26fe145..65f1a22 100644 --- a/scripts/lib/build_perf/html/measurement_chart.html +++ b/scripts/lib/build_perf/html/measurement_chart.html @@ -1,4 +1,5 @@ <script type="text/javascript"> + chartsDrawing += 1; google.charts.setOnLoadCallback(drawChart_{{ chart_elem_id }}); function drawChart_{{ chart_elem_id }}() { var data = new google.visualization.DataTable(); @@ -39,10 +40,9 @@ png_div = document.getElementById('{{ chart_elem_id }}_png'); png_div.outerHTML = '<a id="{{ chart_elem_id }}_png" href="' + chart.getImageURI() + '">PNG</a>'; console.log("CHART READY: {{ chart_elem_id }}"); - {% if last_chart == true %} + chartsDrawing -= 1; + if (chartsDrawing == 0) console.log("ALL CHARTS READY"); - {% endif %} - //console.log(chart_div.innerHTML); }); chart.draw(data, options); } diff --git a/scripts/lib/build_perf/html/report.html b/scripts/lib/build_perf/html/report.html index e428711..165cbb8 100644 --- a/scripts/lib/build_perf/html/report.html +++ b/scripts/lib/build_perf/html/report.html @@ -6,17 +6,14 @@ <script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script> <script type="text/javascript"> google.charts.load('current', {'packages':['corechart']}); +var chartsDrawing = 0; </script> {# Render measurement result charts #} {% for test in test_data %} - {% set test_loop = loop %} {% if test.status == 'SUCCESS' %} {% for measurement in test.measurements %} {% set chart_elem_id = test.name + '_' + measurement.name + '_chart' %} - {% if test_loop.last and loop.last %} - {% set last_chart = true %} - {% endif %} {% include 'measurement_chart.html' %} {% endfor %} {% endif %} -- 2.10.2 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core