Changeset 90152a4 for tests/pybin/tools.py

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

b7c89aa

Parents:

f9feab8 (diff), 305581d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• tests/pybin/tools.py (moved) (moved from src/tests/pybin/tools.py ) (10 diffs)

tests/pybin/tools.py

@@ -9 +9 @@
 import stat
 import sys
+import fileinput
 
 from pybin import settings
@@ -34 +35 @@
                 return proc.returncode, out
 
+def is_ascii(fname):
+        if settings.dry_run:
+                print("is_ascii: %s" % fname)
+                return True
+
+        if not os.path.isfile(fname):
+                return False
+
+        code, out = sh("file %s" % fname, print2stdout = False)
+        if code != 0:
+                return False
+
+        match = re.search(".*: (.*)", out)
+
+        if not match:
+                return False
+
+        return match.group(1).startswith("ASCII text")
+
 # Remove 1 or more files silently
 def rm( files ):
-        try:
+        if isinstance( files, basestring ):
+                sh("rm -f %s > /dev/null 2>&1" % files )
+        else:
                 for file in files:
                         sh("rm -f %s > /dev/null 2>&1" % file )
-        except TypeError:
-                sh("rm -f %s > /dev/null 2>&1" % files )
+
+# Create 1 or more directory
+def mkdir( files ):
+        if isinstance( files, basestring ):
+                sh("mkdir -p %s" % os.path.dirname(files) )
+        else:
+                for file in files:
+                        sh("mkdir -p %s" % os.path.dirname(file) )
+
 
 def chdir( dest = __main__.__file__ ):
@@ -50 +79 @@
 def diff( lhs, rhs ):
         # diff the output of the files
-        diff_cmd = ("diff --ignore-all-space "
+        diff_cmd = ("diff --ignore-all-space --text "
                                 "--ignore-blank-lines "
                                 "--old-group-format='\t\tmissing lines :\n"
@@ -76 +105 @@
                 '-s' if silent else '',
                 test_param,
+                settings.arch.flags,
                 settings.debug.flags,
+                settings.install.flags,
                 flags,
                 target,
@@ -83 +114 @@
         return sh(cmd)
 
+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:
+        if is_exe(program):
+            return program
+    else:
+        for path in os.environ["PATH"].split(os.pathsep):
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return exe_file
+
+    return None
 ################################################################################
 #               file handling
@@ -89 +136 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
-    # first, see if the pattern is even in the file.
-    with open(fname) as f:
-        if not any(re.search(pat, line) for line in f):
-            return # pattern does not occur in file so we are done.
-
-    # pattern is in the file, so perform replace operation.
-    with open(fname) as f:
-        out_fname = fname + ".tmp"
-        out = open(out_fname, "w")
-        for line in f:
-            out.write(re.sub(pat, s_after, line))
-        out.close()
-        os.rename(out_fname, fname)
+        if settings.dry_run:
+                print("replacing '%s' with '%s' in %s" % (pat, s_after, fname))
+                return
+
+        file = fileinput.FileInput(fname, inplace=True, backup='.bak')
+        for line in file:
+                print(line.replace(pat, s_after), end='')
+        file.close()
 
 # helper function to check if a files contains only a specific string
@@ -124 +166 @@
 # transform path to canonical form
 def canonicalPath(path):
-        return os.path.join('.', os.path.normpath(path) )
+        abspath = os.path.abspath(__main__.__file__)
+        dname = os.path.dirname(abspath)
+        return os.path.join(dname, os.path.normpath(path) )
 
 # compare path even if form is different
@@ -135 +179 @@
                 for name in names:
                         path = os.path.join(dirname, name)
-
                         op( path )
 
         # Start the walk
-        os.path.walk('.', step, '')
+        dname = settings.SRCDIR
+        os.path.walk(dname, step, '')
 
 ################################################################################
 #               system
 ################################################################################
-
-# parses the Makefile to find the machine type (32-bit / 64-bit)
-def getMachineType():
-        sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
-        ret, out = make('.dummy', silent = True)
-
-        if ret != 0:
-                print("Failed to identify architecture:")
-                print(out)
-                print("Stopping")
-                rm( (".dummy.c",".dummy") )
-                sys.exit(1)
-
-        _, out = sh("file .dummy", print2stdout=False)
-        rm( (".dummy.c",".dummy") )
-
-        if settings.dry_run :
-                return 'x64'
-
-        return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
-
 # count number of jobs to create
 def jobCount( options, tests ):
         # check if the user already passed in a number of jobs for multi-threading
-        make_flags = os.environ.get('MAKEFLAGS')
-        make_jobs_fds = re.search("--jobserver-(auth|fds)=\s*([0-9]+),([0-9]+)", make_flags) if make_flags else None
-        if make_jobs_fds :
-                tokens = os.read(int(make_jobs_fds.group(2)), 1024)
-                options.jobs = len(tokens)
-                os.write(int(make_jobs_fds.group(3)), tokens)
+        if not options.jobs:
+                make_flags = os.environ.get('MAKEFLAGS')
+                force = bool(make_flags)
+                make_jobs_fds = re.search("--jobserver-(auth|fds)=\s*([0-9]+),([0-9]+)", make_flags) if make_flags else None
+                if make_jobs_fds :
+                        tokens = os.read(int(make_jobs_fds.group(2)), 1024)
+                        options.jobs = len(tokens)
+                        os.write(int(make_jobs_fds.group(3)), tokens)
+                else :
+                        options.jobs = multiprocessing.cpu_count()
         else :
-                options.jobs = multiprocessing.cpu_count()
+                force = True
 
         # make sure we have a valid number of jobs that corresponds to user input
@@ -182 +209 @@
                 sys.exit(1)
 
-        return min( options.jobs, len(tests) ), True if make_flags else False
+        return min( options.jobs, len(tests) ), force
 
 # setup a proper processor pool with correct signal handling
@@ -215 +242 @@
         return False
 
-
-settings.set_machine_default( getMachineType )
+def fancy_print(text):
+        column = which('column')
+        if column:
+                cmd = "%s 2> /dev/null" % column
+                print(cmd)
+                proc = Popen(cmd, stdin=PIPE, stderr=None, shell=True)
+                proc.communicate(input=text)
+        else:
+                print(text)