Changeset 330d933 for tests/pybin

Timestamp:

Aug 25, 2019, 8:48:51 AM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

2aab69b, 5a43ab8

Parents:

f9bf142 (diff), bbb1b35 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/pybin

Files:

• settings.py (modified) (4 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)
@@ -19 +22 @@
 class Architecture:
         KnownArchitectures = {
-                'x64'                   : 'x64',
-                'x86-64'                : 'x64',
-                'x86_64'                : 'x64',
-                'aarch64'               : 'x64',
-                'x86'                   : 'x86',
+                'x64'           : 'x64',
+                'x86-64'        : 'x64',
+                'x86_64'        : 'x64',
+                'x86'           : 'x86',
+                'aarch64'       : 'arm',
                 'i386'          : 'x86',
                 'i486'          : 'x86',
                 'i686'          : 'x86',
                 'Intel 80386'   : 'x86',
-                'arm'                   : 'arm',
-                'ARM'                   : 'arm',
+                'arm'           : 'arm',
+                'ARM'           : 'arm',
         }
 
@@ -113 +116 @@
         global timeout
         global output_width
+        global archive
 
         dry_run      = options.dry_run
@@ -122 +126 @@
         timeout      = Timeouts(options.timeout, options.global_timeout)
         output_width = 24
+        archive      = os.path.abspath(os.path.join(original_path, options.archive_errors)) if options.archive_errors else None
 
 

tests/pybin/tools.py

@@ -2 +2 @@
 import argparse
 import contextlib
+import datetime
 import fileinput
 import multiprocessing
@@ -273 +274 @@
 ################################################################################
 
+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):
@@ -304 +310 @@
         return sh('gdb', '-n', path, core, '-batch', '-x', cmd, output=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):