Changeset b067d9b for tests/pybin/test_run.py

Timestamp:

Oct 29, 2019, 4:01:24 PM (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:

773db65, 9421f3d8

Parents:

7951100 (diff), 8364209 (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

File:

• tests/pybin/test_run.py (moved) (moved from src/tests/pybin/test_run.py ) (4 diffs)

tests/pybin/test_run.py

@@ -4 +4 @@
 
 import pybin.settings
-import datetime
-
-from string import Template
-
-class DeltaTemplate(Template):
-    delimiter = "%"
-
-def strfdelta(tdelta, fmt):
-    d["H"], rem = divmod(tdelta.seconds, 3600)
-    d["M"], d["S"] = divmod(rem, 60)
-    t = DeltaTemplate(fmt)
-    return t.substitute(**d)
 
 # Test class that defines what a test is
@@ -28 +16 @@
 
         def prepare(self):
-                sh("mkdir -p %s" % os.path.join(self.path, '.err'))
-                sh("mkdir -p %s" % os.path.join(self.path, '.out'))
-                sh("mkdir -p %s" % os.path.join(self.path, '.in' ))
+                mkdir( (self.output_log(), self.error_log(), self.input()            ) )
+                rm   ( (self.output_log(), self.error_log(), self.target_executable()) )
 
         def expect(self):
-                return ("%s/.expect/%s%s.txt" % (self.path, self.name, '' if not self.arch else ".%s" % self.arch))
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".expect", "%s%s.txt" % (self.name,'' if not self.arch else ".%s" % self.arch)) )
 
         def error_log(self):
-                return ("%s/.err/%s.log"    % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".err"   , "%s.log" % self.name) )
 
         def output_log(self):
-                return ("%s/.out/%s.log"    % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".out"   , "%s.log" % self.name) )
 
         def input(self):
-                return ("%s/.in/%s.txt"     % (self.path, self.name))
+                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".in"    , "%s.txt" % self.name) )
 
         def target_output(self):
@@ -48 +35 @@
 
         def target(self):
-                return os.path.join(self.path, self.name)
+                return os.path.normpath( os.path.join(self.path, self.name) )
+
+        def target_executable(self):
+                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
         @classmethod
@@ -58 +48 @@
                 test = Test()
                 test.name = os.path.basename(target)
-                test.path = os.path.dirname (target)
-                test.arch = settings.arch.toString() if settings.arch.cross_compile else ''
+                test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
+                test.arch = settings.arch.target if settings.arch.cross_compile else ''
                 return test