Changes in src/tests/test.py [ed45af6:f85bc15]

File:

• src/tests/test.py (modified) (6 diffs)

src/tests/test.py

@@ -19 +19 @@
 
         def matchTest(path):
-                match = re.search("(\.[\w\/\-_]*)\/.expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt", path)
+                match = re.search("%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt" % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -116 +116 @@
 #               running test functions
 ################################################################################
+# fix the absolute paths in the output
+def fixoutput( fname ):
+        if not is_ascii(fname):
+                return
+
+        file_replace(fname, "%s/" % settings.SRCDIR, "")
+
+
 # logic to run a single test and return the result (No handling of printing or other test framework logic)
 def run_single_test(test):
 
         # find the output file based on the test name and options flag
+        exe_file = test.target_executable();
         out_file = test.target_output()
         err_file = test.error_log()
@@ -129 +138 @@
 
         # remove any outputs from the previous tests to prevent side effects
-        rm( (out_file, err_file, test.target()) )
+        rm( (out_file, err_file, exe_file) )
 
         # build, skipping to next test on error
@@ -146 +155 @@
         if make_ret == 0 or settings.dry_run:
                 before = time.time()
-                if settings.dry_run or fileIsExecutable(test.target()) :
+                if settings.dry_run or fileIsExecutable(exe_file) :
                         # run test
-                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (test.target(), out_file), input = in_file)
+                        retcode, _ = sh("timeout 60 %s > %s 2>&1" % (exe_file, out_file), input = in_file)
                 else :
                         # simply cat the result into the output
-                        retcode, _ = sh("cat %s > %s" % (test.target(), out_file))
+                        retcode, _ = sh("cat %s > %s" % (exe_file, out_file))
 
                 after = time.time()
@@ -170 +179 @@
                 else :
                         # fetch return code and error from the diff command
+                        fixoutput(out_file)
                         retcode, error = diff(cmp_file, out_file)
 
@@ -241 +251 @@
 ################################################################################
 if __name__ == "__main__":
-        #always run from same folder
-        chdir()
 
         # parse the command line arguments