Changes in tests/pybin/tools.py [a468e1e9:8364209]

File:

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

tests/pybin/tools.py

@@ -73 +73 @@
                                         )
 
-                                        return proc.returncode, out.decode("latin-1") if out else None
+                                        return proc.returncode, out.decode("utf-8") if out else None
                                 except subprocess.TimeoutExpired:
-                                        if settings.timeout2gdb:
-                                                print("Process {} timeout".format(proc.pid))
-                                                proc.communicate()
-                                                return 124, str(None)
-                                        else:
-                                                proc.send_signal(signal.SIGABRT)
-                                                proc.communicate()
-                                                return 124, str(None)
+                                        proc.send_signal(signal.SIGABRT)
+                                        proc.communicate()
+                                        return 124, str(None)
 
         except Exception as ex:
@@ -88 +83 @@
                 raise
 
-def is_empty(fname):
-        if not os.path.isfile(fname):
-                return True
-
-        if os.stat(fname).st_size == 0:
-                return True
-
-        return False
-
 def is_ascii(fname):
         if settings.dry_run:
                 print("is_ascii: %s" % fname)
-                return (True, "")
+                return True
 
         if not os.path.isfile(fname):
-                return (False, "No file")
-
-        code, out = sh("file", fname, output_file=subprocess.PIPE)
+                return False
+
+        code, out = sh("file %s" % fname, output_file=subprocess.PIPE)
         if code != 0:
-                return (False, "'file EXPECT' failed with code {}".format(code))
+                return False
 
         match = re.search(".*: (.*)", out)
 
         if not match:
-                return (False, "Unreadable file type: '{}'".format(out))
-
-        if "ASCII text" in match.group(1):
-                return (True, "")
-
-        return (False, "File type should be 'ASCII text', was '{}'".format(match.group(1)))
+                return False
+
+        return match.group(1).startswith("ASCII text")
 
 def is_exe(fname):
@@ -132 +115 @@
                 return None
 
-        file = open(file, mode, encoding="latin-1") # use latin-1 so all chars mean something.
+        file = open(file, mode)
         exitstack.push(file)
         return file
@@ -181 +164 @@
                 '-s' if silent else None,
                 test_param,
-                settings.ast.flags,
                 settings.arch.flags,
                 settings.debug.flags,
@@ -192 +174 @@
         return sh(*cmd, output_file=output_file, error=error)
 
-def make_recon(target):
-        cmd = [
-                *settings.make,
-                '-W',
-                os.path.abspath(os.path.join(settings.BUILDDIR, '../driver/cfa')),
-                '--recon',
-                target
-        ]
-        cmd = [s for s in cmd if s]
-        return sh(*cmd, output_file=subprocess.PIPE)
-
 def which(program):
-        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
+    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
 
 @contextlib.contextmanager
@@ -262 +234 @@
 # helper function to check if a files contains only a specific string
 def file_contains_only(file, text) :
-        with open(file, encoding="latin-1") as f: # use latin-1 so all chars mean something.
+        with open(file) as f:
                 ff = f.read().strip()
                 result = ff == text.strip()
@@ -270 +242 @@
 # transform path to canonical form
 def canonical_path(path):
-        abspath = os.path.abspath(os.path.realpath(__main__.__file__))
+        abspath = os.path.abspath(__main__.__file__)
         dname = os.path.dirname(abspath)
         return os.path.join(dname, os.path.normpath(path) )
@@ -351 +323 @@
         raise argparse.ArgumentTypeError(msg)
 
-# Convert a function that converts a string to one that converts comma separated string.
-def comma_separated(elements):
-    return lambda string: [elements(part) for part in string.split(',')]
-
 def fancy_print(text):
         column = which('column')
@@ -397 +365 @@
 
 class Timed:
-        def __enter__(self):
-                self.start = time.time()
-                return self
-
-        def __exit__(self, *args):
-                self.end = time.time()
-                self.duration = self.end - self.start
+    def __enter__(self):
+        self.start = time.time()
+        return self
+
+    def __exit__(self, *args):
+        self.end = time.time()
+        self.duration = self.end - self.start
 
 def timed(src, timeout):
         expire = time.time() + timeout
         i = iter(src)
-        with contextlib.suppress(StopIteration):
-                while True:
-                        yield i.next(max(expire - time.time(), 0))
-
-def fmtDur( duration ):
-        if duration :
-                hours, rem = divmod(duration, 3600)
-                minutes, rem = divmod(rem, 60)
-                seconds, millis = divmod(rem, 1)
-                return "%2d:%02d.%03d" % (minutes, seconds, millis * 1000)
-        return " n/a"
+        while True:
+                yield i.next(max(expire - time.time(), 0))