Skip to contentSkip to conversation

support/testing: rename check_broken_links to has_broken_links

PATCH New Luca Ceresoli 2 participants 4 messages May 16, 2017 – May 17, 2017

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/3 support/testing: rename check_broken_links to has_broken_links

has_broken_links makes it self-explanatory that this is a predicate function, and that the return value tells whether there _are_ broken links, not the opposite.

Signed-off-by Luca Ceresoli <[email protected]>
---
 support/testing/tests/toolchain/test_external.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
support/testing/tests/toolchain/test_external.py +3 -3
index 1fbf81f8d356..0b15d489db8f 100644
@@ -7,7 +7,7 @@ BR2_TARGET_ROOTFS_CPIO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 """
 
-def check_broken_links(path):
+def has_broken_links(path):
     for root, dirs, files in os.walk(path):
         for f in files:
             fpath = os.path.join(root, f)

@@ -20,9 +20,9 @@ class TestExternalToolchain(infra.basetest.BRTest):
         # Check for broken symlinks
         for d in ["lib", "usr/lib"]:
             path = os.path.join(self.builddir, "staging", d)
-            self.assertFalse(check_broken_links(path))
+            self.assertFalse(has_broken_links(path))
             path = os.path.join(self.builddir, "target", d)
-            self.assertFalse(check_broken_links(path))
+            self.assertFalse(has_broken_links(path))
 
         interp = infra.get_elf_prog_interpreter(self.builddir,
                                                 self.toolchain_prefix,
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/3 support/testing: document get_elf_prog_interpreter

Signed-off-by Luca Ceresoli <[email protected]>
---
 support/testing/infra/__init__.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
support/testing/infra/__init__.py +10 -0
index c3f645cf99d7..b5634f6f64d7 100644
@@ -77,6 +77,16 @@ def get_file_arch(builddir, prefix, fpath):
     return get_elf_arch_tag(builddir, prefix, fpath, "Tag_CPU_arch")
 
 def get_elf_prog_interpreter(builddir, prefix, fpath):
+    """
+    Runs the cross readelf on 'fpath' to extract the program interpreter
+    name and returns it.
+    Example:
+    >>> get_elf_prog_interpreter('br-tests/TestExternalToolchainLinaroArm',
+                                 'arm-linux-gnueabihf',
+                                 'bin/busybox')
+    /lib/ld-linux-armhf.so.3
+    >>>
+    """
     cmd = ["host/usr/bin/{}-readelf".format(prefix),
            "-l", os.path.join("target", fpath)]
     out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"})
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 3/3 support/testing/run-tests: help: put the one-letter form before the long form

In reply to Luca Ceresoli

This is what the manpages usually do, and what Python does with the automatically-added -h/--help parameter:

Before the change:

  $ ./support/testing/run-tests
    [...]
  optional arguments:
    -h, --help            show this help message and exit
    --list, -l            list of available test cases
    --all, -a             execute all test cases

After the change:

  $ ./support/testing/run-tests
    [...]
  optional arguments:
    -h, --help            show this help message and exit
    -l, --list            list of available test cases
    -a, --all             execute all test cases
Signed-off-by Luca Ceresoli <[email protected]>
---
 support/testing/run-tests | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
support/testing/run-tests +6 -6
index 339bb66efa34..07dad0d8b938 100755
@@ -10,17 +10,17 @@ def main():
     parser = argparse.ArgumentParser(description='Run Buildroot tests')
     parser.add_argument('testname', nargs='*',
                         help='list of test cases to execute')
-    parser.add_argument('--list', '-l', action='store_true',
+    parser.add_argument('-l', '--list', action='store_true',
                         help='list of available test cases')
-    parser.add_argument('--all', '-a', action='store_true',
+    parser.add_argument('-a', '--all', action='store_true',
                         help='execute all test cases')
-    parser.add_argument('--stdout', '-s', action='store_true',
+    parser.add_argument('-s', '--stdout', action='store_true',
                         help='log everything to stdout')
-    parser.add_argument('--output', '-o',
+    parser.add_argument('-o', '--output',
                         help='output directory')
-    parser.add_argument('--download', '-d',
+    parser.add_argument('-d', '--download',
                         help='download directory')
-    parser.add_argument('--keep', '-k',
+    parser.add_argument('-k', '--keep',
                         help='keep build directories',
                         action='store_true')
Signature · 1 line
2.7.4
#3 lore raw

PATCH 1/3 support/testing: rename check_broken_links to has_broken_links

In reply to Luca Ceresoli

Hello,

Quoted 8 lines · Luca Ceresoli

has_broken_links makes it self-explanatory that this is a predicate function, and that the return value tells whether there _are_ broken links, not the opposite.

Signed-off-by Luca Ceresoli <[email protected]>
---
 support/testing/tests/toolchain/test_external.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Series applied to master. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com