Changeset 5c4a473 for tests/pybin

Timestamp:

Aug 15, 2019, 10:31:53 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6daaee3

Parents:

d65f92c (diff), 3c7f01b (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 distcc

Location:

tests/pybin

Files:

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

tests/pybin/settings.py

@@ -4 +4 @@
 from . import tools
 
+global original_path
+
 try :
+        original_path = os.getcwd()
         testpath = os.path.dirname(os.path.abspath(os.path.join(os.getcwd(), sys.argv[0])))
         sys.path.append(testpath)
@@ -118 +121 @@
         global timeout
         global output_width
+<<<<<<< HEAD
         global distcc
+=======
+        global archive
+>>>>>>> master
 
         dry_run      = options.dry_run
@@ -128 +135 @@
         timeout      = Timeouts(options.timeout, options.global_timeout)
         output_width = 24
+<<<<<<< HEAD
         distcc       = "DISTCC_CFA_PATH=~/.cfadistcc/%s/cfa" % tools.config_hash()
+=======
+        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
+>>>>>>> master
 
         if distribute and not os.environ.get('DISTCC_LOG'):

tests/pybin/tools.py

@@ -2 +2 @@
 import argparse
 import contextlib
+import datetime
 import fileinput
 import multiprocessing
@@ -289 +290 @@
         return out.strip()
 
+# get pretty string for time of day
+def pretty_now():
+        ts = time.time()
+        print(ts, file=sys.stderr)
+        return datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d_%H:%M:%S')
+
 # check if arguments is yes or no
 def yes_no(string):
@@ -320 +327 @@
         return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output_file=subprocess.PIPE)
 
+def core_archive(dst, name, exe):
+        # Get the files to copy
+        core = os.path.join(os.getcwd(), "core" )
+
+        # Uncomment if we want timestamps on coredumps
+        # dst  = os.path.join(dst, "%s_%s" % (name, pretty_now()))
+
+        # make a directory for this test
+        mkdir(os.path.join(dst, "dir"))
+
+        # moves the files
+        mv( core, os.path.join(dst, "core" ) )
+        mv( exe , os.path.join(dst, name   ) )
+
+        # return explanatory test
+        return "Archiving %s (executable and core) to %s" % (os.path.relpath(exe, settings.BUILDDIR), os.path.relpath(dst, settings.original_path))
+
 class Timed:
     def __enter__(self):