Changeset 91788fa for src/tests/pybin/test_run.py

Timestamp:

Jul 25, 2018, 6:23:58 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:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (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

File:

• src/tests/pybin/test_run.py (modified) (2 diffs)

src/tests/pybin/test_run.py

@@ -33 +33 @@
 
         def expect(self):
-                return ("%s/.expect/%s%s.txt" % (self.path, self.name, '' if not self.arch else ".%s" % self.arch))
+                return ("%s.expect/%s%s.txt" % (os.path.join(settings.SRCDIR, self.path), self.name, '' if not self.arch else ".%s" % self.arch))
 
         def error_log(self):
-                return ("%s/.err/%s.log"    % (self.path, self.name))
+                return ("%s.err/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def output_log(self):
-                return ("%s/.out/%s.log"    % (self.path, self.name))
+                return ("%s.out/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def input(self):
-                return ("%s/.in/%s.txt"     % (self.path, self.name))
+                return ("%s.in/%s.txt"     % (os.path.join(settings.SRCDIR, self.path), self.name))
 
         def target_output(self):
@@ -49 +49 @@
         def target(self):
                 return os.path.join(self.path, self.name)
+
+        def target_executable(self):
+                return os.path.join(settings.BUILDDIR, self.path, self.name)
 
         @classmethod