Changeset 14b253d for tests

Timestamp:

Aug 15, 2018, 11:22:23 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

3de9135

Parents:

636e1b9 (diff), bdff89d (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 plg2:software/cfa/cfa-cc

Location:

tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• config.py.in (modified) (1 diff)
• pybin/settings.py (modified) (5 diffs)
• pybin/tools.py (modified) (2 diffs)
• test.py (modified) (6 diffs)

tests/Makefile.am

@@ -24 +24 @@
 concurrent=
 
-TEST_PY = python ${srcdir}/test.py
+TEST_PY = python ${builddir}/test.py
 
 # applies to both programs

tests/Makefile.in

@@ -301 +301 @@
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 concurrent = 
-TEST_PY = python ${srcdir}/test.py
+TEST_PY = python ${builddir}/test.py
 
 # applies to both programs

tests/config.py.in

@@ -5 +5 @@
 """
 
-SRCDIR   = "@srcdir@"
-BUILDDIR = "@builddir@"
+SRCDIR   = "@abs_srcdir@"
+BUILDDIR = "@abs_builddir@"
 HOSTARCH = "@host_cpu@"

tests/pybin/settings.py

@@ -6 +6 @@
 
 try :
-        sys.path.append(os.getcwd())
+        testpath = os.path.dirname(os.path.abspath(os.path.join(os.getcwd(), sys.argv[0])))
+        sys.path.append(testpath)
         import config
 
         SRCDIR = os.path.abspath(config.SRCDIR)
         BUILDDIR = os.path.abspath(config.BUILDDIR)
+        os.chdir(testpath)
+
 except:
         print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
@@ -88 +91 @@
                 self.flags  = """INSTALL_FLAGS="%s" """ % ("" if value else "-in-tree")
 
+class Timeouts:
+        def __init__(self, ts, tg):
+                self.single = Timeouts.check(ts)
+                self.total  = Timeouts.check(tg)
+
+        @classmethod
+        def check(_, value):
+                if value < 1:
+                        print("Timeouts must be at least 1 second", file=sys.stderr)
+                        sys.exit(1)
+
+                return value
+
 def init( options ):
         global arch
@@ -95 +111 @@
         global debug
         global install
+        global timeout
 
         dry_run    = options.dry_run
@@ -102 +119 @@
         install    = Install(options.install)
         arch       = Architecture(options.arch)
+        timeout    = Timeouts(options.timeout, options.global_timeout)
 
 
@@ -110 +128 @@
 
 def validate():
-        make_ret, _ = tools.make( ".validate", error_file = ".validate.err", redirects  = "2> /dev/null 1> /dev/null", )
+        errf = os.path.join(BUILDDIR, ".validate.err")
+        make_ret, _ = tools.make( ".validate", error_file = errf, redirects  = "2> /dev/null 1> /dev/null", )
         if make_ret != 0:
-                with open (".validate.err", "r") as myfile:
+                with open (errf, "r") as myfile:
                         error=myfile.read()
                 print("ERROR: Invalid configuration %s:%s" % (arch.string, debug.string), file=sys.stderr)
                 print("       verify returned : \n%s" % error, file=sys.stderr)
-                tools.rm("%s/.validate.err" % BUILDDIR)
+                tools.rm(errf)
                 sys.exit(1)
 
-        tools.rm("%s/.validate.err" % BUILDDIR)
+        tools.rm(errf)

tests/pybin/tools.py

@@ -36 +36 @@
 
 def is_ascii(fname):
+        if settings.dry_run:
+                print("is_ascii: %s" % fname)
+                return True
+
         if not os.path.isfile(fname):
                 return False
@@ -132 +136 @@
 # helper function to replace patterns in a file
 def file_replace(fname, pat, s_after):
+        if settings.dry_run:
+                print("replacing '%s' with '%s' in %s" % (pat, s_after, fname))
+                return
+
         file = fileinput.FileInput(fname, inplace=True, backup='.bak')
         for line in file:

tests/test.py

@@ -88 +88 @@
         parser.add_argument('--install', help='Run all tests based on installed binaries or tree binaries', type=yes_no, default='no')
         parser.add_argument('--arch', help='Test for specific architecture', type=str, default='')
+        parser.add_argument('--timeout', help='Maximum duration in seconds after a single test is considered to have timed out', type=int, default=60)
+        parser.add_argument('--global-timeout', help='Maximum cumulative duration in seconds after the ALL tests are considered to have timed out', type=int, default=7200)
         parser.add_argument('--dry-run', help='Don\'t run the tests, only output the commands', action='store_true')
         parser.add_argument('--list', help='List all test available', action='store_true')
@@ -160 +162 @@
                 if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
@@ -172 +174 @@
 
         if retcode == 0:
+                fixoutput(out_file)
                 if settings.generating :
                         # if we are ounly generating the output we still need to check that the test actually exists
@@ -182 +185 @@
                 else :
                         # fetch return code and error from the diff command
-                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)
 
@@ -234 +236 @@
                         tests,
                         chunksize = 1
-                ).get(7200)
+                ).get(settings.timeout.total)
         except KeyboardInterrupt:
                 pool.terminate()
@@ -283 +285 @@
         # users may want to simply list the tests
         if options.list_comp :
-                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected -j --jobs ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --install --timeout --global-timeout -j --jobs ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))