diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index 8707f7a..969ac0d 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -36,11 +36,10 @@ class UnityTestSummary if lines.length == 0 raise "Empty test result file: #{result_file}" else - summary_line = -2 output = get_details(result_file, lines) failure_output << output[:failures] unless output[:failures].empty? ignore_output << output[:ignores] unless output[:ignores].empty? - tests,failures,ignored = parse_test_summary(lines[summary_line]) + tests,failures,ignored = parse_test_summary(lines) @total_tests += tests @failures += failures @ignored += ignored @@ -106,7 +105,7 @@ class UnityTestSummary end def parse_test_summary(summary) - if summary =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ + if summary[-3..-1].join("\n") =~ /(\d+) Tests (\d+) Failures (\d+) Ignored/ [$1.to_i,$2.to_i,$3.to_i] else raise "Couldn't parse test results: #{summary}" diff --git a/src/unity_internals.h b/src/unity_internals.h index 07fbbaa..c9c7dc0 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -279,8 +279,8 @@ void UnityAssertEqualFloatArray(const _UF* expected, // Basic Fail and Ignore //------------------------------------------------------- -#define UNITY_TEST_FAIL(line, message) { UnityFail( (message), (UNITY_LINE_TYPE)line); } -#define UNITY_TEST_IGNORE(line, message) { UnityIgnore( (message), (UNITY_LINE_TYPE)line); } +#define UNITY_TEST_FAIL(line, message) UnityFail( (message), (UNITY_LINE_TYPE)line); +#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)line); //------------------------------------------------------- // Test Asserts