Changeset 7030dab for tests/pybin

Timestamp:

Apr 6, 2020, 4:46:28 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

e3bc51c

Parents:

71d6bd8 (diff), 057298e (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 new-ast

Location:

tests/pybin

Files:

• settings.py (modified) (4 diffs)
• tools.py (modified) (4 diffs)

tests/pybin/settings.py

@@ -77 +77 @@
                         print("updated to %s" % self.target)
 
-        def match(self, arch):
+        def filter(self, tests):
+                return [test for test in tests if not test.arch or self.target == test.arch]
                 return True if not arch else self.target == arch
 
@@ -113 +114 @@
 
 def init( options ):
+        global all_arch
+        global all_debug
+        global all_install
         global arch
         global archive
+        global continue_
         global debug
-        global distcc
         global dry_run
         global generating
@@ -123 +127 @@
         global output_width
         global timeout
+        global timeout2gdb
 
-        arch         = Architecture(options.arch)
+        all_arch     = [Architecture(o) for o in list(dict.fromkeys(options.arch   ))]
+        all_debug    = [Debug(o)        for o in list(dict.fromkeys(options.debug  ))]
+        all_install  = [Install(o)      for o in list(dict.fromkeys(options.install))]
         archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
-        debug        = Debug(options.debug)
+        continue_    = options.continue_
         dry_run      = options.dry_run # must be called before tools.config_hash()
-        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         generating   = options.regenerate_expected
-        install      = Install(options.install)
         make         = ['make']
         output_width = 24
         timeout      = Timeouts(options.timeout, options.global_timeout)
+        timeout2gdb  = options.timeout_with_gdb
 
         # if we distribute, distcc errors will fail tests, use log file for distcc
@@ -146 +152 @@
 
 def validate():
+        """Validate the current configuration and update globals"""
+
+        global distcc
+        distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
         errf = os.path.join(BUILDDIR, ".validate.err")
         make_ret, out = tools.make( ".validate", error_file = errf, output_file=subprocess.DEVNULL, error=subprocess.DEVNULL )

tests/pybin/tools.py

@@ -75 +75 @@
                                         return proc.returncode, out.decode("utf-8") if out else None
                                 except subprocess.TimeoutExpired:
-                                        proc.send_signal(signal.SIGABRT)
-                                        proc.communicate()
-                                        return 124, str(None)
+                                        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)
 
         except Exception as ex:
@@ -175 +180 @@
 
 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
@@ -323 +327 @@
         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')
@@ -365 +373 @@
 
 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)
-        while True:
-                yield i.next(max(expire - time.time(), 0))
+        with contextlib.suppress(StopIteration):
+                while True:
+                        yield i.next(max(expire - time.time(), 0))