From patchwork Mon Mar 13 10:50:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Robert P. J. Day" X-Patchwork-Id: 738062 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vhZRs56h4z9s7C for ; Mon, 13 Mar 2017 21:51:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5C9D9C21C54; Mon, 13 Mar 2017 10:51:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8CF08C21C32; Mon, 13 Mar 2017 10:51:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B6D76C21C32; Mon, 13 Mar 2017 10:51:27 +0000 (UTC) Received: from smtp484.redcondor.net (smtp484.redcondor.net [208.80.204.84]) by lists.denx.de (Postfix) with ESMTPS id C9DADC21C2D for ; Mon, 13 Mar 2017 10:51:26 +0000 (UTC) Received: from astoria.ccjclearline.com ([64.235.106.9]) by smtp484.redcondor.net ({c48374e7-08df-40d9-a0de-96cc9883a037}) via TCP (outbound) with ESMTPS id 20170313105103989_0484 for ; Mon, 13 Mar 2017 10:51:03 +0000 X-RC-FROM: X-RC-RCPT: Received: from [216.191.234.70] (port=25081 helo=crashcourse.ca) by astoria.ccjclearline.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.80) (envelope-from ) id 1cnNZ3-0004Gh-IZ for u-boot@lists.denx.de; Mon, 13 Mar 2017 06:50:57 -0400 Date: Mon, 13 Mar 2017 06:50:55 -0400 (EDT) From: "Robert P. J. Day" X-X-Sender: rpjday@uk63952.mitel.com To: U-Boot list Message-ID: User-Agent: Alpine 2.20 (LFD 67 2015-01-07) MIME-Version: 1.0 X-MAG-OUTBOUND: ccj.redcondor.net@64.235.106.9/32 Subject: [U-Boot] [PATCH] test-fit.py: Minor grammar/spelling/clarification tweaks X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" * Add note that execution needs Python development package installed * Standardize on upper case "FIT", "FDT" as necessary for clarity * Fix "tempoerary", "linex" typos Signed-off-by: Robert P. J. Day diff --git a/test/image/test-fit.py b/test/image/test-fit.py index db0649f..b0d0538 100755 --- a/test/image/test-fit.py +++ b/test/image/test-fit.py @@ -11,6 +11,9 @@ # make O=sandbox sandbox_config # make O=sandbox # ./test/image/test-fit.py -u sandbox/u-boot +# +# Note: The above testing requires the Python development package, typically +# called python-devel or something similar. import doctest from optparse import OptionParser @@ -115,8 +118,8 @@ base_fdt = ''' }; ''' -# This is the U-Boot script that is run for each test. First load the fit, -# then do the 'bootm' command, then save out memory from the places where +# This is the U-Boot script that is run for each test. First load the FIT, +# then run the 'bootm' command, then save out memory from the places where # we expect 'bootm' to write things. Then quit. base_script = ''' sb load hostfs 0 %(fit_addr)x %(fit)s @@ -266,7 +269,7 @@ def find_matching(text, match): >>> find_matching('first line:10\\nsecond_line:20', 'first line:') '10' - >>> find_matching('first line:10\\nsecond_line:20', 'second linex') + >>> find_matching('first line:10\\nsecond_line:20', 'second line') Traceback (most recent call last): ... ValueError: Test aborted @@ -389,7 +392,7 @@ def run_fit_test(mkimage, u_boot): fail('Ramdisk loaded but should not be', stdout) # Find out the offset in the FIT where U-Boot has found the FDT - line = find_matching(stdout, 'Booting using the fdt blob at ') + line = find_matching(stdout, 'Booting using the FDT blob at ') fit_offset = int(line, 16) - params['fit_addr'] fdt_magic = struct.pack('>L', 0xd00dfeed) data = read_file(fit) @@ -469,7 +472,7 @@ def run_tests(): print '\nTests passed' print 'Caveat: this is only a sanity check - test coverage is poor' - # Remove the tempoerary directory unless we are asked to keep it + # Remove the temporary directory unless we are asked to keep it if options.keep: print "Output files are in '%s'" % base_dir else: