From patchwork Wed Mar 25 15:18:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 14355 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2PFK8M0002571 for ; Wed, 25 Mar 2009 15:20:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755563AbZCYPTY (ORCPT ); Wed, 25 Mar 2009 11:19:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755503AbZCYPTY (ORCPT ); Wed, 25 Mar 2009 11:19:24 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:36331 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753924AbZCYPTW (ORCPT ); Wed, 25 Mar 2009 11:19:22 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e31.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n2PFGNTF019294 for ; Wed, 25 Mar 2009 09:16:23 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n2PFJ8wi055922 for ; Wed, 25 Mar 2009 09:19:16 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n2PFJ73Z023898 for ; Wed, 25 Mar 2009 09:19:07 -0600 Received: from localhost.localdomain (frylock.austin.ibm.com [9.53.41.12]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n2PFJ4Np023663 for ; Wed, 25 Mar 2009 09:19:04 -0600 Received: by localhost.localdomain (Postfix, from userid 1000) id A3A7E1BF80; Wed, 25 Mar 2009 10:18:59 -0500 (CDT) Date: Wed, 25 Mar 2009 10:18:59 -0500 From: Ryan Harper To: kvm@vger.kernel.org Subject: [PATCH] kvm-autotest: write relative path in html report Message-ID: <20090325151859.GK27104@us.ibm.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When generating an html report from make_html_report.py, one needs to supply the full path to the results directory. This value ends up being embedded in the output which breaks relocating the results dir to a --- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html different path. This patch adds a new flag that supresses the full path value when generating the report. I'm looking to generate a summary html report in the results dir and relocate the results dir to a different server which can be done with this patch. -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh@us.ibm.com diffstat output: make_html_report.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) Signed-off-by: Ryan Harper --- diff --git a/client/tests/kvm_runtest_2/make_html_report.py b/client/tests/kvm_runtest_2/make_html_report.py index ddb896f..3d0326a 100755 --- a/client/tests/kvm_runtest_2/make_html_report.py +++ b/client/tests/kvm_runtest_2/make_html_report.py @@ -1655,8 +1655,9 @@ def get_kvm_version(result_dir): def main(argv): dirname = None output_file_name = None + relative_path = False try: - opts, args = getopt.getopt(argv, "r:f:h", ['help']) + opts, args = getopt.getopt(argv, "r:f:h:R", ['help']) except getopt.GetoptError: usage() sys.exit(2) @@ -1668,10 +1669,17 @@ def main(argv): dirname = arg elif opt == '-f': output_file_name = arg + elif opt == '-R': + relative_path = True else: usage() sys.exit(1) + html_path = dirname + # don't use absolute path in html output if relative flag passed + if relative_path: + html_path = '' + if dirname: if os.path.isdir(dirname): # TBD: replace it with a validation of autotest result dir res_dir = os.path.abspath(dirname) @@ -1704,7 +1712,7 @@ def main(argv): 'kvmver':get_kvm_version(dirname) } - make_html_file(metalist, results_data, tag, host, output_file_name, dirname) + make_html_file(metalist, results_data, tag, host, output_file_name, html_path) sys.exit(0) else: print 'Invalid result directory <%s>' % dirname