Changeset f85bc15 for src/tests/pybin/test_run.py

Timestamp:

Jul 23, 2018, 4:46:36 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

552f5cb

Parents:

46782ab5

Message:

Test now work outside of tree except for io2

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