ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-08-06 11:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

- updating to handle new standard unity output

Browse Source 
git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@156 bf332499-1b4d-0410-844d-d2d48d5cc64c
This commit is contained in:
mvandervoord
2010-03-10 03:09:49 +00:00
parent e79a5f13d1
commit 1ff34b5c04
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rakefile_helper.rb
+1 -1
View File
@@ -254,7 +254,7 @@ module RakefileHelpers
tests.each_with_index do |test, index|
# compare test's intended pass/fail state with pass/fail state in actual results;
# if they don't match, the system test has failed
if (test[:pass] != !((test_results =~ /test#{index+1}::: PASS/).nil?))
if ((test[:pass] and (test_results =~ /:PASS/).nil?) or (!test[:pass] and (test_results =~ /:FAIL/).nil?))
total_failures += 1
test_results =~ /test#{index+1}:(.+)/
failure_messages << "#{test_file}:test#{index+1}:should #{test[:should]}:#{$1}"
test/c/TestCMockCDynamic_Runner.c
+6 -6
View File
@@ -28,12 +28,12 @@ int main(void)
UnityBegin();
// RUN_TEST calls runTest
RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes);
RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize);
RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation);
RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot);
RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether);
RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes);
RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 20);
RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize, 29);
RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 39);
RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot, 53);
RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether, 64);
RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes, 146);
UnityEnd();
test/c/TestCMockC_Runner.c
+7 -7
View File
@@ -29,13 +29,13 @@ int main(void)
UnityBegin();
// RUN_TEST calls runTest
RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes);
RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation);
RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot);
RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether);
RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenItRunsOutOfMemory);
RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenAskForMoreThanItHasLeftEvenIfNotAtExactEnd);
RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes);
RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 15);
RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 25);
RUN_TEST(test_MemNextWillReturnNullIfGivenABadRoot, 39);
RUN_TEST(test_ThatWeCanClaimAndChainAFewElementsTogether, 50);
RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenItRunsOutOfMemory, 132);
RUN_TEST(test_ThatCMockStopsReturningMoreDataWhenAskForMoreThanItHasLeftEvenIfNotAtExactEnd, 178);
RUN_TEST(test_ThatWeCanAskForAllSortsOfSizes, 225);
UnityEnd();