Changeset afe8882 for tests/pybin/settings.py

Timestamp:

Aug 15, 2018, 3:51:12 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

bdff89d

Parents:

7bd4cc9

Message:

Fixed calling tests from outside directory and added arguments to change test timeouts (still can't be configured for a specific test)

File:

• tests/pybin/settings.py (modified) (5 diffs)

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)