Merge pull request #2161 from willend/main

Update mctest with log of attained test value if test ran

Author: willend

tools/Python/mctest/mctest.py

@@ -340,11 +340,7 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, version=
         test.runtime = t2 - t1
 
         # log to terminal
-        if test.didrun:
-            formatstr = "%-" + "%ds: " % (maxnamelen+1) + \
-                "{:3d}.".format(math.floor(test.runtime)) + str(test.runtime-int(test.runtime)).split('.')[1][:2]
-            logging.info(formatstr % test.get_display_name())
-        else:
+        if not test.didrun:
             formatstr = "%-" + "%ds: RUNTIME ERROR" % (maxnamelen+1)
             logging.info(formatstr % instrname + ", " + cmd)
             failed=True
@@ -369,6 +365,13 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, version=
             except:
                 test.testval=-1
                 failed=True
+
+        if test.didrun and not failed:
+            formatstr = "%-" + "%ds: " % (maxnamelen+1) + \
+                "{:3d}.".format(math.floor(test.runtime)) + str(test.runtime-int(test.runtime)).split('.')[1][:2]
+            print(formatstr)
+            logging.info(formatstr % test.get_display_name() + "    [val: " + str(test.testval) + " / " + str(test.targetval) + " = " + str(round(100.0*test.testval/test.targetval)) + " %]")
+
         # save test result to disk
         test.testcomplete = True
         test.save(infolder=join(testdir, test.instrname))