ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-09-03 00:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- cr/lf marker independent parsing code for summary

Browse Source 
- removed pointless braces in a couple of macros

git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@91 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2010-08-24 00:12:11 +00:00
parent f5ce02f135
commit 8f0d259539
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auto/unity_test_summary.rb
+2 -3
View File
@@ -36,11 +36,10 @@ class UnityTestSummary
if lines.length == 0 if lines.length == 0
raise "Empty test result file: #{result_file}" raise "Empty test result file: #{result_file}"
else else
summary_line = -2
output = get_details(result_file, lines) output = get_details(result_file, lines)
failure_output << output[:failures] unless output[:failures].empty? failure_output << output[:failures] unless output[:failures].empty?
ignore_output << output[:ignores] unless output[:ignores].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 @total_tests += tests
@failures += failures @failures += failures
@ignored += ignored @ignored += ignored
@@ -106,7 +105,7 @@ class UnityTestSummary
end end
def parse_test_summary(summary) 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] [$1.to_i,$2.to_i,$3.to_i]
else else
raise "Couldn't parse test results: #{summary}" raise "Couldn't parse test results: #{summary}"
src/unity_internals.h
+2 -2
View File
@@ -279,8 +279,8 @@ void UnityAssertEqualFloatArray(const _UF* expected,
// Basic Fail and Ignore // Basic Fail and Ignore
//------------------------------------------------------- //-------------------------------------------------------
#define UNITY_TEST_FAIL(line, message) { UnityFail( (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); } #define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)line);
//------------------------------------------------------- //-------------------------------------------------------
// Test Asserts // Test Asserts