Changes in tests/test.py [0c13238:f7d3215]

File:

• tests/test.py (modified) (7 diffs)

tests/test.py

@@ -19 +19 @@
 
         def matchTest(path):
-                match = re.search("^%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt$" % settings.SRCDIR, path)
+                match = re.search("%s\/([\w\/\-_]*).expect\/([\w\-_]+)(\.[\w\-_]+)?\.txt" % settings.SRCDIR, path)
                 if match :
                         test = Test()
@@ -34 +34 @@
 # reads the directory ./.expect and indentifies the tests
 def listTests( includes, excludes ):
+        includes = [canonicalPath( i ) for i in includes] if includes else None
+        excludes = [canonicalPath( i ) for i in excludes] if excludes else None
+
         # tests directly in the .expect folder will always be processed
         test_list = findTests()
@@ -121 +124 @@
 #               running test functions
 ################################################################################
-def success(val):
-        return val == 0 or settings.dry_run
-
-def isExe(file):
-        return settings.dry_run or fileIsExecutable(file)
-
-def noRule(file, target):
-        return not settings.dry_run and fileContainsOnly(file, "make: *** No rule to make target `%s'.  Stop." % target)
+# 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)
@@ -144 +146 @@
 
         # build, skipping to next test on error
-        with Timed() as comp_dur:
-                make_ret, _ = make( test.target(),      redirects  = ("2> %s 1> /dev/null" % out_file), error_file = err_file )
+        before = time.time()
+        make_ret, _ = make( test.target(),
+                redirects  = "2> %s 1> /dev/null" % out_file,
+                error_file = err_file
+        )
+        after = time.time()
+
+        comp_dur = after - before
+
+        run_dur = None
 
         # if the make command succeds continue otherwise skip to diff
-        run_dur = None
-        if success(make_ret):
-                with Timed() as run_dur:
-                        if isExe(exe_file):
-                                # run test
-                                retcode = run(exe_file, out_file, in_file)
-                        else :
-                                # simply cat the result into the output
-                                retcode = cat(exe_file, out_file)
+        if make_ret == 0 or settings.dry_run:
+                before = time.time()
+                if settings.dry_run or fileIsExecutable(exe_file) :
+                        # run test
+                        retcode, _ = sh("timeout %d %s > %s 2>&1" % (settings.timeout.single, exe_file, out_file), input = in_file)
+                else :
+                        # simply cat the result into the output
+                        retcode, _ = sh("cat %s > %s" % (exe_file, out_file))
+
+                after = time.time()
+                run_dur = after - before
         else:
-                retcode = mv(err_file, out_file)
-
-        if success(retcode):
+                retcode, _ = sh("mv %s %s" % (err_file, out_file))
+
+
+        if retcode == 0:
+                # fixoutput(out_file)
                 if settings.generating :
                         # if we are ounly generating the output we still need to check that the test actually exists
-                        if noRule(out_file, test.target()) :
-                                retcode = 1
+                        if not settings.dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.target()) :
+                                retcode = 1;
                                 error = "\t\tNo make target for test %s!" % test.target()
-                                rm(out_file)
+                                sh("rm %s" % out_file, False)
                         else:
                                 error = None
@@ -177 +191 @@
                         error = myfile.read()
 
-                ret, info = coreInfo(exe_file)
-                error = error + info
-
-
 
         # clean the executable
-        rm(exe_file)
-
-        return retcode, error, [comp_dur.duration, run_dur.duration if run_dur else None]
+        sh("rm -f %s > /dev/null 2>&1" % test.target())
+
+        return retcode, error, [comp_dur, run_dur]
 
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
@@ -192 +202 @@
         with SignalHandling():
                 # print formated name
-                name_txt = "%24s  " % t.name
+                name_txt = "%20s  " % t.name
 
                 retcode, error, duration = run_single_test(t)
@@ -256 +266 @@
         allTests = listTests( options.include, options.exclude )
 
-
         # if user wants all tests than no other treatement of the test list is required
         if options.all or options.list or options.list_comp or options.include :