Changeset 5c4a473 for tests

Timestamp:

Aug 15, 2019, 10:31:53 AM (5 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

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• pybin/settings.py (modified) (3 diffs)
• pybin/tools.py (modified) (3 diffs)
• test.py (modified) (3 diffs)

tests/Makefile.am

@@ -22 +22 @@
 debug=yes
 installed=no
+archiveerrors=
 
 INSTALL_FLAGS=-in-tree
@@ -58 +59 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :

tests/Makefile.in

@@ -378 +378 @@
 debug = yes
 installed = no
+archiveerrors = 
 INSTALL_FLAGS = -in-tree
 DEBUG_FLAGS = -debug -O0
@@ -777 +778 @@
 #----------------------------------------------------------------------------------------------------------------
 all-local :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} ${quick_test}
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} ${quick_test}
 
 all-tests :
-        @+${TEST_PY} --debug=${debug} --install=${installed} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
+        @+${TEST_PY} --debug=${debug} --install=${installed} --archive-errors=${archiveerrors} ${concurrent} ${timeouts} --all # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
 
 clean-local :

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):

tests/test.py

@@ -91 +91 @@
         parser.add_argument('--all', help='Run all test available', action='store_true')
         parser.add_argument('--regenerate-expected', help='Regenerate the .expect by running the specified tets, can be used with --all option', action='store_true')
+        parser.add_argument('--archive-errors', help='If called with a valid path, on test crashes the test script will copy the core dump and the executable to the specified path.', type=str, default='')
         parser.add_argument('-j', '--jobs', help='Number of tests to run simultaneously', type=int)
         parser.add_argument('--list-comp', help='List all valide arguments', action='store_true')
@@ -179 +180 @@
                         error = error + info if error else info
 
+                        if settings.archive:
+                                error = error + '\n' + core_archive(settings.archive, test.target(), exe_file)
+
 
 
@@ -295 +299 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))