Merge pull request #659 from fy666/master

Parse test execution time in unity fixture output

Author: mvandervoord

auto/parse_output.rb

@@ -138,41 +138,44 @@ def prepare_fixture_line(line)
   def test_passed_unity_fixture(array)
     class_name = array[0]
     test_name  = array[1]
+    test_time = get_test_time(array[array.length - 1])
     test_suite_verify(class_name)
-    printf "%-40s PASS\n", test_name
+    printf "%-40s PASS %10d ms\n", test_name, test_time
 
-    push_xml_output_passed(test_name) if @xml_out
+    push_xml_output_passed(test_name, test_time) if @xml_out
   end
 
   # Test was flagged as having failed so format the output.
   # This is using the Unity fixture output and not the original Unity output.
   def test_failed_unity_fixture(array)
     class_name = array[0]
     test_name  = array[1]
+    test_time = get_test_time(array[array.length - 1])
     test_suite_verify(class_name)
     reason_array = array[2].split(':')
     reason = "#{reason_array[-1].lstrip.chomp} at line: #{reason_array[-4]}"
 
-    printf "%-40s FAILED\n", test_name
+    printf "%-40s FAILED %10d ms\n", test_name, test_time
 
-    push_xml_output_failed(test_name, reason) if @xml_out
+    push_xml_output_failed(test_name, reason, test_time) if @xml_out
   end
 
   # Test was flagged as being ignored so format the output.
   # This is using the Unity fixture output and not the original Unity output.
   def test_ignored_unity_fixture(array)
     class_name = array[0]
     test_name  = array[1]
+    test_time = get_test_time(array[array.length - 1])
     reason = 'No reason given'
     if array.size > 2
       reason_array = array[2].split(':')
       tmp_reason = reason_array[-1].lstrip.chomp
       reason = tmp_reason == 'IGNORE' ? 'No reason given' : tmp_reason
     end
     test_suite_verify(class_name)
-    printf "%-40s IGNORED\n", test_name
+    printf "%-40s IGNORED %10d ms\n", test_name, test_time
 
-    push_xml_output_ignored(test_name, reason) if @xml_out
+    push_xml_output_ignored(test_name, reason, test_time) if @xml_out
   end
 
   # Test was flagged as having passed so format the output

extras/fixture/src/unity_fixture.c

@@ -131,6 +131,9 @@ void UnityIgnoreTest(const char* printableName, const char* group, const char* n
         if (UnityFixture.Verbose)
         {
             UnityPrint(printableName);
+            UNITY_EXEC_TIME_START();
+            UNITY_EXEC_TIME_STOP();
+            UNITY_PRINT_EXEC_TIME();
             UNITY_PRINT_EOL();
         }
         else if (UnityFixture.Silent)
@@ -323,6 +326,8 @@ void UnityConcludeFixtureTest(void)
     if (Unity.CurrentTestIgnored)
     {
         Unity.TestIgnores++;
+        UNITY_EXEC_TIME_STOP();
+        UNITY_PRINT_EXEC_TIME();
         UNITY_PRINT_EOL();
     }
     else if (!Unity.CurrentTestFailed)
@@ -339,6 +344,8 @@ void UnityConcludeFixtureTest(void)
     else /* Unity.CurrentTestFailed */
     {
         Unity.TestFailures++;
+        UNITY_EXEC_TIME_STOP();
+        UNITY_PRINT_EXEC_TIME();
         UNITY_PRINT_EOL();
     }