Commit Graph

420 Commits

Author SHA1 Message Date
Mark VanderVoord 7243a3d78b Pull in latest libraries and boost version information v2.4.3 2016-10-27 23:10:26 -04:00
Mark VanderVoord 8d4153c39c merge in latest CException and Unity 2016-10-27 18:31:16 -04:00
Mark VanderVoord c5ea034965 Merge pull request #80 from austinglaser/master
cmock handles multiple helper headers
2016-10-27 10:17:56 -04:00
Mark VanderVoord d2819592a7 Merge pull request #95 from SteinHeselmans/master
Add config option that allows for weak mocked functions
2016-10-27 10:16:15 -04:00
Stein Heselmans 006a3097a1 add .swp (vim swap files) to git ignore list 2016-10-14 14:46:54 +02:00
Stein Heselmans c910393cca More configuration options for weak symbols 2016-10-14 14:46:33 +02:00
Stein Heselmans 6c8054dc34 Add config option that allows for weak mocked functions 2016-10-14 13:43:02 +02:00
Mark VanderVoord 8e79a1a831 Update to latest Unity and CException 2016-08-12 10:02:04 -04:00
Mark VanderVoord 25f4c65ecf Merge branch 'master' of https://github.com/ThrowTheSwitch/CMock 2016-08-11 12:40:18 -04:00
Mark VanderVoord 0996f5fb55 Update docs to correct an argument.
Update create mock to maintain Ruby 1.8.6 compatibility
2016-08-11 12:39:50 -04:00
Mark VanderVoord 3aa9f60991 Merge pull request #88 from dmurdin/TMS470
Pragma fix for TMS470 compilers. (Thanks!)
2016-07-13 07:47:12 -04:00
Daniel Murdin af2226b15f Fixed unit tests for TMS470 pragma fix. 2016-07-13 13:36:31 +02:00
Daniel Murdin a8b2497fe6 Pragma fix for TMS470 compilers. 2016-07-13 12:31:22 +02:00
Mark VanderVoord eff3a01c7f Latest Unity 2016-06-05 14:17:49 -04:00
Mark VanderVoord 2f0a44d7ce Attempting to be smarter about recognizing pointer placement in the return values (though we're not going to officially system test some of the illegal combinations) 2016-06-05 14:12:37 -04:00
Mark VanderVoord fe693146e5 Update to latest Unity & CException 2016-05-06 21:28:08 -04:00
Mark VanderVoord 5de74001eb Attempt to fix (once and for all) the way CMock handles const in arguments and return values. 2016-05-06 21:26:25 -04:00
Mark VanderVoord f341e3f650 Merge pull request #83 from thirtytwobits/feature/cl-fixes
Two small fixes to shell integration points.
2016-05-04 17:45:02 -04:00
Dixon a18e537b37 Two small fixes to shell integration points.
1. Fixing bug where environment variable was being ignored.
2. Adding "UNITY_DIR" to allow a path to unity specified by the environment.
2016-05-04 14:16:18 -07:00
Austin Glaser 6545913260 arrayify helper path within cmock 2016-04-21 17:31:26 -06:00
Austin Glaser 02b0838086 cmock handles multiple helper headers 2016-04-21 16:12:11 -06:00
Mark VanderVoord caba771da1 Pulled in latest Unity and CException and bumped version 2016-04-14 21:24:09 -04:00
Mark VanderVoord 7ac2e9859e grab latest Unity 2016-04-14 21:18:19 -04:00
Mark VanderVoord 4ced2e4710 Strip out nested pairs of braces in order to protect against function definitions in the header files (inline or otherwise). 2016-03-17 07:52:19 -04:00
Mark VanderVoord a20b14a575 Allow extern "C" to have no whitespace between end of quotes and start of opening brace 2016-03-14 07:06:29 -04:00
Mark VanderVoord fe78ef6d64 Merge pull request #75 from mike-rob/master
Fix for const to allow returnThruPtr to be generated for const pointers with mutable data (Thanks Mike-Rob!)
2016-03-09 10:52:38 -05:00
Michael Robertson 7ee610eb37 Fix for const to allow returnThruPtr to be generated for const pointers with mutable data 2016-03-09 11:22:45 +13:00
Mark VanderVoord d266c698c7 Merge pull request #73 from SteinHeselmans/master
add mock_suffix configuration option
2016-03-02 11:45:33 -05:00
Stein Heselmans 9f1ae5e2a5 fix test cases for addition of mock_suffix 2016-03-02 09:02:22 +01:00
Stein Heselmans 9e36dc07b1 add mock_suffix configuration option
Same as mock_prefix configuration option. A suffix is easier to work with, if
cmock generation is done from an external GNU makefile.
2016-03-01 16:18:22 +01:00
Mark VanderVoord 9af31cd7bb Use latest CException 2016-02-25 17:37:31 -05:00
Mark VanderVoord 9394a29d61 Pull in latest Unity & Verify we can pull in files with Unicode comments. 2016-02-25 15:38:09 -05:00
Mark VanderVoord c7d7e761a5 - CMock should now automatically create root mock directory if it doesn't exist (issue #68) 2016-02-24 16:24:09 -05:00
Mark VanderVoord 581642e08c Updated to latest Unity 2016-01-07 14:23:47 -05:00
Mark VanderVoord 17898f5078 Normalize all the line endings 2016-01-07 14:11:52 -05:00
Mark VanderVoord d6efa5b88a Fix numerous small errors concerning precedence of plugins, particularly related to callbacks, return_thru_ptr, and expect_any_args 2016-01-07 13:38:59 -05:00
Mark VanderVoord 3efc2d1aef Merge pull request #53 from jonmills/patch-1
Update README.md
2016-01-05 19:39:56 -05:00
Mark VanderVoord 26d56f39e8 Merge pull request #54 from johngun3/support_dashes_in_option_values
Support dashes in command line option values (Thanks for the patch, johngun3. Thanks for the reminder, combsjy)
2016-01-05 17:18:48 -05:00
Mark VanderVoord 2ac0ccb27b fixed white space 2016-01-04 20:00:32 -05:00
Mark VanderVoord 3fa4de14be -fix whitespace 2016-01-04 19:27:48 -05:00
Mark VanderVoord f7346cd052 Merge branch 'feature/less_const' 2016-01-04 19:14:56 -05:00
Mark VanderVoord 9e2d5a034c Merge pull request #46 from aizvorski/master
Update README.md
2016-01-04 19:13:02 -05:00
Mark VanderVoord d1ab630308 - Added a couple more tests to our details test
- Added a gitattributes file to force line endings to be correct.
2015-12-30 16:33:33 -05:00
Mark VanderVoord cda8d3a7e1 - push the internal function and argument names into a single each per mock to further reduce const overhead. 2015-12-12 12:24:38 -05:00
Mark VanderVoord f78ab04001 - Grab the latest version of Unity in order to inherit detail display for fail, null, etc. 2015-12-10 21:49:34 -05:00
Mark VanderVoord ffe2098a5b - Pull in nicer formatting and fixes to RUN_TEST found in Unity 2015-12-10 18:22:17 -05:00
Mark VanderVoord 647876644b - Centralized error strings to a few constants.
- Made use of the new UNITY_SET_DETAILS feature to background set up function & argument details for messages
- CMock now takes up a lot less memory! woo!
2015-12-10 16:58:10 -05:00
Mark VanderVoord ada6dd2d22 - Pull in latest version of Unity 2015-12-10 13:08:12 -05:00
Mark VanderVoord 4fcca4bab7 - Moved the "Out of Memory" string into a const to stop repeating it.
- Added test for Out of Memory error
- reorder the way we handle includes in CMock internals to match the way it works in Unity
2015-12-10 11:09:26 -05:00
Mark VanderVoord 8dc65e82bf - Temporarily ignore these errors while we figure out what to do about them properly 2015-12-08 22:03:54 -05:00