From patchwork Thu May 31 12:42:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 162149 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 879CAB6FB9 for ; Thu, 31 May 2012 22:42:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sa4hi-0004x9-5K for incoming@patchwork.ozlabs.org; Thu, 31 May 2012 12:42:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Sa4hg-0004wp-Rt for fwts-devel@lists.ubuntu.com; Thu, 31 May 2012 12:42:12 +0000 Received: from cpc19-craw6-2-0-cust5.croy.cable.virginmedia.com ([77.102.228.6] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Sa4hg-0000OG-N2 for fwts-devel@lists.ubuntu.com; Thu, 31 May 2012 12:42:12 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 4/4] lib: fwts_summary: HTML summary should not be in verbatum Date: Thu, 31 May 2012 13:42:09 +0100 Message-Id: <1338468129-5491-5-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1338468129-5491-1-git-send-email-colin.king@canonical.com> References: <1338468129-5491-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Ivan Hu Tested-by: Chris Van Hoof --- src/lib/src/fwts_summary.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/lib/src/fwts_summary.c b/src/lib/src/fwts_summary.c index f6f449a..19371ea 100644 --- a/src/lib/src/fwts_summary.c +++ b/src/lib/src/fwts_summary.c @@ -224,12 +224,26 @@ int fwts_summary_report(fwts_framework *fw, fwts_list *test_list) fwts_list_foreach(item, fwts_summaries[i]) { fwts_summary_item *summary_item = fwts_list_data(fwts_summary_item *,item); char *lines = fwts_summary_lines(&summary_item->log_lines); - fwts_log_summary_verbatum(fw, " %s test, at %d log line%s: %s: %s", - summary_item->test, - fwts_list_len(&summary_item->log_lines), - fwts_list_len(&summary_item->log_lines) > 1 ? "s" : "", - lines, - summary_item->text); + + /* + * This is not pleasant, we really don't want very wide lines + * logged in the HTML format, where we don't mind for other formats. + */ + if (fw->log_type == LOG_TYPE_HTML) + fwts_log_summary(fw, " %s test, at %d log line%s: %s: %s", + summary_item->test, + fwts_list_len(&summary_item->log_lines), + fwts_list_len(&summary_item->log_lines) > 1 ? "s" : "", + lines, + summary_item->text); + else + fwts_log_summary_verbatum(fw, " %s test, at %d log line%s: %s: %s", + summary_item->test, + fwts_list_len(&summary_item->log_lines), + fwts_list_len(&summary_item->log_lines) > 1 ? "s" : "", + lines, + summary_item->text); + free(lines); } fwts_log_section_end(fw->results); @@ -241,7 +255,8 @@ int fwts_summary_report(fwts_framework *fw, fwts_list *test_list) fwts_log_nl(fw); } - if (fw->log_type == LOG_TYPE_PLAINTEXT && fw->total_run > 0) { + if ((fw->log_type == LOG_TYPE_PLAINTEXT || + fw->log_type == LOG_TYPE_HTML) && fw->total_run > 0) { sorted = fwts_list_new(); fwts_list_foreach(item, test_list) fwts_list_add_ordered(sorted, fwts_list_data(fwts_framework_test *,item), fwts_framework_compare_test_name);