diff --git a/verifier/summary_template.html b/verifier/summary_template.html index d27a9487..0afe6782 100644 --- a/verifier/summary_template.html +++ b/verifier/summary_template.html @@ -177,7 +177,7 @@ // If platform/exec order is specified, use that. let executed_platforms = []; // exec_set includes all those that are represented in the data - const platform_order = ["$platform_order"]; + const platform_order = $platform_order; if (platform_order.length <= 0 || platform_order[0] == 'alphabetic' || platform_order[0] == "None") { // Default is alphabetic sort diff --git a/verifier/testreport.py b/verifier/testreport.py index b1045115..91ea3216 100644 --- a/verifier/testreport.py +++ b/verifier/testreport.py @@ -1182,6 +1182,12 @@ def __init__(self, file_base): self.templates = reportTemplate() + # Default + self.platform_order = ['ICU4C', 'ICU4J', 'ICU4X', 'NodeJS', 'Dart_Web', 'Dart_Native'] + + if self.debug > 1: + logging.info('SUMMARY REPORT base = %s', self.file_base) + self.summary_html_path = None self.header_item_template = Template( @@ -1304,11 +1310,16 @@ def summarize_reports(self): def create_summary_html(self): # Generate HTML page containing this information # Create the template + + # Make a string that looks like a JS list. + order_of_platforms = json.dumps(self.platform_order) + html_map = { 'all_platforms': ', '.join(list(self.exec_summary.keys())), 'all_icu_versions': None, # TEMP!!! 'all_tests': ', '.join(list(self.type_summary.keys())), 'datetime': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), + 'platform_order': order_of_platforms, } # Create header for each executor header_line = '' # TODO diff --git a/verifier/verifier.py b/verifier/verifier.py index 73c3756b..41444e85 100644 --- a/verifier/verifier.py +++ b/verifier/verifier.py @@ -308,7 +308,6 @@ def create_summary_reports(self): summary_report.setup_all_test_results() - if self.options.platform_order: # Set the order of the platforms in the summary dashboard summary_report.platform_order = self.options.platform_order