Changes in src/tests/test.py [c2d5e28:c07d724]

File:

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

src/tests/test.py

@@ -24 +24 @@
         self.name, self.path = name, path
 
-class TestResult:
-        SUCCESS = 0
-        FAILURE = 1
-        TIMEOUT = 124
-
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
         sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         ret, out = sh("make .dummy -s", print2stdout=True)
-
+        
         if ret != 0:
                 print("Failed to identify architecture:")
@@ -166 +161 @@
 
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
-
-        retcode = 0
-        error = None
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
 
         # if the make command succeds continue otherwise skip to diff
@@ -178 +170 @@
                 if fileIsExecutable(test.name) :
                         # run test
-                        retcode, _ = sh("timeout 60 ./%s %s > %s 2>&1" % (test.name, stdinput, out_file), dry_run)
+                        sh("./%s %s > %s 2>&1" % (test.name, stdinput, out_file), dry_run)
                 else :
                         # simply cat the result into the output
@@ -187 +179 @@
                 sh("mv %s %s" % (err_file, out_file), dry_run)
 
-        if retcode == 0:
-                if generate :
-                        # if we are ounly generating the output we still need to check that the test actually exists
-                        if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
-                                retcode = 1;
-                                error = "\t\tNo make target for test %s!" % test.name
-                                sh("rm %s" % out_file, False)
-                else :
-                        # fetch return code and error from the diff command
-                        retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
+        retcode = 0
+        error = None
+
+        if generate :
+                # if we are ounly generating the output we still need to check that the test actually exists
+                if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
+                        retcode = 1;
+                        error = "\t\tNo make target for test %s!" % test.name
+                        sh("rm %s" % out_file, False)
+
+        else :
+                # fetch return code and error from the diff command
+                retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
+        
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -209 +205 @@
         name_txt = "%20s  " % t.name
 
-        retcode, error = run_single_test(t, generate, dry_run, debug)
+        #run the test instance and collect the result
+        test_failed, error = run_single_test(t, generate, dry_run, debug)
 
         # update output based on current action
         if generate :
-                if   retcode == TestResult.SUCCESS:     result_txt = "Done"
-                elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
-                else :                                          result_txt = "ERROR"
-        else :
-                if   retcode == TestResult.SUCCESS:     result_txt = "PASSED"
-                elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
-                else :                                          result_txt = "FAILED"
+                failed_txt = "ERROR"
+                success_txt = "Done"
+        else :
+                failed_txt = "FAILED"
+                success_txt = "PASSED"
 
         #print result with error if needed
-        text = name_txt + result_txt
+        text = name_txt + (failed_txt if test_failed else success_txt)
         out = sys.stdout
         if error :
@@ -228 +223 @@
                 out = sys.stderr
 
-        print(text, file = out)
+        print(text, file = out);
         sys.stdout.flush()
         sys.stderr.flush()
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
-        return retcode != TestResult.SUCCESS
+        return test_failed
 
 # run the given list of tests with the given parameters
@@ -274 +269 @@
 if __name__ == "__main__":
         #always run from same folder
-        chdir()
-
+        chdir() 
+        
         # parse the command line arguments
         options = getOptions()