Changeset 5bf1f3e for tests/pybin/tools.py

Timestamp:

Mar 26, 2019, 10:36:58 AM (5 years ago)

Author:

tdelisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1bb2488

Parents:

eb60b04

Message:

Code review of test.py and pybin

File:

• tests/pybin/tools.py (modified) (9 diffs)

tests/pybin/tools.py

@@ -55 +55 @@
         return match.group(1).startswith("ASCII text")
 
+def is_exe(fname):
+        return os.path.isfile(fname) and os.access(fname, os.X_OK)
+
 # Remove 1 or more files silently
 def rm( files ):
@@ -79 +82 @@
         # diff the output of the files
         diff_cmd = ("diff --text "
-#                               "--ignore-all-space "
-#                               "--ignore-blank-lines "
-                                "--old-group-format='\t\tmissing lines :\n"
-                                "%%<' \\\n"
-                                "--new-group-format='\t\tnew lines :\n"
-                                "%%>' \\\n"
-                                "--unchanged-group-format='%%=' \\"
-                                "--changed-group-format='\t\texpected :\n"
-                                "%%<"
-                                "\t\tgot :\n"
-                                "%%>\n' \\\n"
-                                "--new-line-format='\t\t%%dn\t%%L' \\\n"
-                                "--old-line-format='\t\t%%dn\t%%L' \\\n"
-                                "--unchanged-line-format='' \\\n"
-                                "%s %s")
+                        "--old-group-format='\t\tmissing lines :\n"
+                        "%%<' \\\n"
+                        "--new-group-format='\t\tnew lines :\n"
+                        "%%>' \\\n"
+                        "--unchanged-group-format='%%=' \\"
+                        "--changed-group-format='\t\texpected :\n"
+                        "%%<"
+                        "\t\tgot :\n"
+                        "%%>\n' \\\n"
+                        "--new-line-format='\t\t%%dn\t%%L' \\\n"
+                        "--old-line-format='\t\t%%dn\t%%L' \\\n"
+                        "--unchanged-line-format='' \\\n"
+                        "%s %s")
 
         # fetch return code and error from the diff command
@@ -115 +116 @@
 
 def which(program):
-    import os
-    def is_exe(fpath):
-        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
     fpath, fname = os.path.split(program)
     if fpath:
@@ -160 +157 @@
 
 # helper function to check if a files contains only a specific string
-def fileContainsOnly(file, text) :
+def file_contains_only(file, text) :
         with open(file) as f:
                 ff = f.read().strip()
                 result = ff == text.strip()
 
-                return result;
-
-# check whether or not a file is executable
-def fileIsExecutable(file) :
-        try :
-                fileinfo = os.stat(file)
-                return bool(fileinfo.st_mode & stat.S_IXUSR)
-        except Exception as inst:
-                print(type(inst))    # the exception instance
-                print(inst.args)     # arguments stored in .args
-                print(inst)
-                return False
+                return result
 
 # transform path to canonical form
-def canonicalPath(path):
+def canonical_path(path):
         abspath = os.path.abspath(__main__.__file__)
         dname = os.path.dirname(abspath)
@@ -185 +171 @@
 
 # compare path even if form is different
-def pathCmp(lhs, rhs):
-        return canonicalPath( lhs ) == canonicalPath( rhs )
+def path_cmp(lhs, rhs):
+        return canonical_path( lhs ) == canonical_path( rhs )
 
 # walk all files in a path
-def pathWalk( op ):
-        def step(_, dirname, names):
-                for name in names:
-                        path = os.path.join(dirname, name)
-                        op( path )
-
-        # Start the walk
+def path_walk( op ):
         dname = settings.SRCDIR
         for dirname, _, names in os.walk(dname):
@@ -206 +186 @@
 ################################################################################
 # count number of jobs to create
-def jobCount( options, tests ):
+def job_count( options, tests ):
         # check if the user already passed in a number of jobs for multi-threading
         if not options.jobs:
@@ -229 +209 @@
 
 # setup a proper processor pool with correct signal handling
-def setupPool(jobs):
+def setup_pool(jobs):
         original_sigint_handler = signal.signal(signal.SIGINT, signal.SIG_IGN)
         pool = multiprocessing.Pool(jobs)
@@ -261 +241 @@
                 return False
         raise argparse.ArgumentTypeError(msg)
-        return False
 
 def fancy_print(text):
@@ -273 +252 @@
 
 
-def coreInfo(path):
+def core_info(path):
         cmd   = os.path.join(settings.SRCDIR, "pybin/print-core.gdb")
         if not os.path.isfile(cmd):