<html>
  <head>

    <meta http-equiv="content-type" content="text/html; charset=utf-8">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    <p>The format for name of test report file is<br>
Test_report_${value_of_where_option}_${time}.${format_of_test_report}<br>
      <br>
      Signed-off-by: Hoang Van Tuyen
      <a class="moz-txt-link-rfc2396E" href="mailto:tuyen.hoangvan@toshiba-tsdv.com">&lt;tuyen.hoangvan@toshiba-tsdv.com&gt;</a><br>
      ---<br>
       engine/scripts/ftc | 32 ++++++++++++++++++++++----------<br>
       1 file changed, 22 insertions(+), 10 deletions(-)<br>
      <br>
      diff --git a/engine/scripts/ftc b/engine/scripts/ftc<br>
      index 7fa0333..c1a2887 100755<br>
      --- a/engine/scripts/ftc<br>
      +++ b/engine/scripts/ftc<br>
      @@ -2071,14 +2071,14 @@ def add_page_number(canvas, doc):<br>
           text = "Page %s" % page_num<br>
           canvas.drawRightString(200*mm, 20*mm, text)<br>
       <br>
      -def gen_pdf_report(header_data, report_data, report_dir):<br>
      +def gen_pdf_report(header_data, report_data, report_file):<br>
           from reportlab.lib import colors<br>
           from reportlab.lib.pagesizes import A4<br>
           from reportlab.lib.styles import getSampleStyleSheet<br>
           from reportlab.platypus import SimpleDocTemplate, Table,
      TableStyle, Paragraph<br>
       <br>
           # create a pdf file<br>
      -    doc = SimpleDocTemplate(report_dir + "report.pdf",
      pagesize=A4)<br>
      +    doc = SimpleDocTemplate(report_file, pagesize=A4)<br>
           elements = []<br>
       <br>
           # generate header<br>
      @@ -2125,7 +2125,7 @@ def excel_column_name(n):<br>
               name = chr(r + ord('A')) + name<br>
           return name<br>
       <br>
      -def gen_excel_report(header_data, report_data, report_dir):<br>
      +def gen_excel_report(header_data, report_data, report_file):<br>
           from openpyxl import Workbook<br>
           from openpyxl.style import Fill, Color<br>
       <br>
      @@ -2164,14 +2164,13 @@ def gen_excel_report(header_data,
      report_data, report_dir):<br>
              
      workbook.remove_sheet(workbook.get_sheet_by_name("Sheet"))<br>
       <br>
           # save the report<br>
      -    workbook.save(report_dir + "report.xlsx")<br>
      +    workbook.save(report_file)<br>
       <br>
      -def gen_csv_report(header_data, report_data, report_dir):<br>
      +def gen_csv_report(header_data, report_data, report_file):<br>
           import csv<br>
       <br>
      -    filename = report_dir + "report.csv"<br>
           # generate header<br>
      -    with open(filename, "wb") as report:<br>
      +    with open(report_file, "wb") as report:<br>
               writer = csv.writer(report)<br>
               writer.writerows(header_data)<br>
       <br>
      @@ -2238,6 +2237,19 @@ def do_gen_report(conf, options):<br>
               # make we cannot create a directory.<br>
               error_out("Invalid report directory '%s'" % report_dir)<br>
       <br>
      +    # create name of test report file with format
      Test_report_testname_time<br>
      +    test_file_name = "Test_report_" +
      time.strftime("%Y-%m-%d_%H-%M-%S")<br>
      +    if "--where" in options:<br>
      +        test_file_name = "Test_report_" +
      options[options.index("--where")+1] + \<br>
      +                         "_" + time.strftime("%Y-%m-%d_%H-%M-%S")<br>
      +<br>
      +    # report_file includes the report_dir, test_file_name and fmt<br>
      +    # always include "/" to make sure the test_file_name into
      report_dir<br>
      +    if fmt == "excel":<br>
      +        report_file = report_dir + "/" + test_file_name + "." +
      "xlsx"<br>
      +    else:<br>
      +        report_file = report_dir + "/" + test_file_name + "." +
      fmt<br>
      +<br>
           # get data for report<br>
           header_data = get_report_header_data(run_list, run_map,
      header_fields)<br>
           report_data = get_report_data(run_list, run_map, fields)<br>
      @@ -2247,13 +2259,13 @@ def do_gen_report(conf, options):<br>
           if fmt=="html":<br>
               report = gen_html_report(header_data, report_data)<br>
           if fmt=="pdf":<br>
      -        gen_pdf_report(header_data, report_data, report_dir)<br>
      +        gen_pdf_report(header_data, report_data, report_file)<br>
               sys.exit(0)<br>
           if fmt=="excel":<br>
      -        gen_excel_report(header_data, report_data, report_dir)<br>
      +        gen_excel_report(header_data, report_data, report_file)<br>
               sys.exit(0)<br>
           if fmt=="csv":<br>
      -        gen_csv_report(header_data, report_data, report_dir)<br>
      +        gen_csv_report(header_data, report_data, report_file)<br>
               sys.exit(0)<br>
       <br>
           print report<br>
      -- <br>
      2.1.4<br>
      <br>
    </p>
    <pre wrap="">_______________________________________________
Fuego mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Fuego@lists.linuxfoundation.org">Fuego@lists.linuxfoundation.org</a>
<a class="moz-txt-link-freetext" href="https://lists.linuxfoundation.org/mailman/listinfo/fuego">https://lists.linuxfoundation.org/mailman/listinfo/fuego</a></pre>
  </body>
</html>