Changes in / [0300979:b9c04946]

Location:

src/tests

Files:

• pybin/test_run.py (modified) (3 diffs)
• pybin/tools.py (modified) (1 diff)
• test.py (modified) (2 diffs)

src/tests/pybin/test_run.py

@@ -28 +28 @@
 
         def prepare(self):
-                mkdir( (self.output_log(), self.error_log(), self.input()            ) )
-                rm   ( (self.output_log(), self.error_log(), self.target_executable()) )
+                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' ))
 
         def expect(self):
-                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)) )
+                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 os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".err"   , "%s.log" % self.name) )
+                return ("%s.err/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def output_log(self):
-                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, ".out"   , "%s.log" % self.name) )
+                return ("%s.out/%s.log"    % (os.path.join(settings.BUILDDIR, self.path), self.name))
 
         def input(self):
-                return os.path.normpath( os.path.join(settings.SRCDIR  , self.path, ".in"    , "%s.txt" % self.name) )
+                return ("%s.in/%s.txt"     % (os.path.join(settings.SRCDIR, self.path), self.name))
 
         def target_output(self):
@@ -47 +48 @@
 
         def target(self):
-                return os.path.normpath( os.path.join(self.path, self.name) )
+                return os.path.join(self.path, self.name)
 
         def target_executable(self):
-                return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
+                return os.path.join(settings.BUILDDIR, self.path, self.name)
 
         @classmethod
@@ -60 +61 @@
                 test = Test()
                 test.name = os.path.basename(target)
-                test.path = os.path.relpath (os.path.dirname(target), settings.SRCDIR)
+                test.path = os.path.dirname (target)
                 test.arch = settings.arch.toString() if settings.arch.cross_compile else ''
                 return test

src/tests/pybin/tools.py

@@ -57 +57 @@
         except TypeError:
                 sh("rm -f %s > /dev/null 2>&1" % files )
-
-# Create 1 or more directory
-def mkdir( files ):
-        try:
-                for file in files:
-                        sh("mkdir -p %s" % os.path.dirname(file) )
-        except TypeError:
-                sh("mkdir -p %s" % os.path.dirname(files) )
 
 def chdir( dest = __main__.__file__ ):

src/tests/test.py

@@ -64 +64 @@
                         testname = canonicalPath( testname )
                         if Test.valid_name(testname):
-                                found = [test for test in allTests if canonicalPath( test.target() ) == testname]
+                                found = [test for test in allTests if test.target() == testname]
                                 tests.append( found[0] if len(found) == 1 else Test.from_target(testname) )
                         else :
@@ -137 +137 @@
         test.prepare()
 
+        # remove any outputs from the previous tests to prevent side effects
+        rm( (out_file, err_file, exe_file) )
+
         # build, skipping to next test on error
         before = time.time()