Commit Graph

453 Commits

Author SHA1 Message Date
Mark VanderVoord dfc1955c51 Switching to markdown documentation. Add coding standard. 2017-04-07 13:36:44 -04:00
Mark VanderVoord 1939bbe666 Merge pull request #114 from JaskoWojtek/master
Improve handling of braces in function definition (Thanks @JaskoWojtek !)
2017-04-05 15:08:38 -04:00
Mark VanderVoord dcd6fe44af Updated docs
Fixed a couple little issues and added a note about example projects
2017-04-05 14:49:55 -04:00
WojciechJasko 8b73bf3835 Merge branch 'master' of https://github.com/JaskoWojtek/CMock 2017-04-05 20:39:17 +02:00
WojciechJasko 648f3960ff Improve handling of braces in function definition 2017-04-05 20:38:59 +02:00
Mark VanderVoord f4f149792f Update docs
Elaborate  on :strippables feature in docs to fix issue #16
2017-04-05 14:38:24 -04:00
Mark VanderVoord b666bf05c1 Update CMock_Summary.md 2017-04-05 12:42:03 -04:00
Mark VanderVoord a139775672 Update CMock documentation 2017-04-05 11:38:57 -04:00
Mark VanderVoord 660c342fc6 Merge pull request #115 from redarc-tech/return-thru-volatile-ptr-fix
Suppress warning when returning thru const or volatile ptr
2017-04-05 09:24:56 -04:00
Mark VanderVoord 1bb97ff2a8 Update travis.yml
Update travis.yml to newer versions of Ruby and to check on OSX and Linux
2017-04-05 08:45:46 -04:00
Tim Bates d2fc813b51 Suppress warning when returning thru const or volatile ptr
GCC gives a warning:
  warning: passing argument 1 of 'memcpy' discards 'const volatile'
  qualifier from pointer target type

and the same for argument 2. These additional casts suppress the
warning.
2017-04-03 11:19:16 +09:30
WojciechJasko a182e33a9a Improve handling of braces in function definition 2017-04-02 20:31:02 +02:00
Mark VanderVoord dd791fe407 Remove support for versions of Ruby before 2.0 (as Rubylang doesn’t even support them anymore) 2017-03-20 16:18:09 -04:00
Mark VanderVoord 06b9f23054 Update to latest Unity 2017-03-14 08:13:59 -04:00
Mark VanderVoord 9be03c215a Merge pull request #112 from ajsetter/header-parsing-brackets
Improve handling of brackets in function params. Thanks so much, @ajsetter!
2017-03-03 14:30:59 -05:00
Andrew Setter ebf4ae274a Allow for whitespace between parens and brackets 2017-03-03 13:30:22 -05:00
Andrew Setter a55efdba19 Improve handling of brackets in function params
During header parsing, #define substitutions in fixed-length array
function parameters can have parentheses in them which can cause a
failure in the bracket->asterisk conversion that happens during the
mocking process. This change updates the regex to also match for
parentheses in the function parameter brackets to ensure they get
swapped out.
2017-03-03 13:12:04 -05:00
Mark VanderVoord 42a937a097 Merge pull request #111 from 0ge/master
Check destination when returning thru ptr
2017-02-16 11:09:50 -05:00
Oscar Edvardsson 9e49bace32 Before memcpy'ing when returning through pointer, check that destination is not NULL. 2017-02-16 17:05:35 +01:00
Mark VanderVoord eddfb75d59 Merge pull request #109 from redarc-tech/ignore-bool
Clear Ignore flag when StubWithCallback is called (Thanks!)
2017-02-13 06:54:42 -05:00
Tim Bates 39e99e9803 Fix system test
Generator for callback plugin now checks for existence of ignore plugin
to know what code to generate
2017-02-13 17:36:20 +10:30
Tim Bates 30064aa63c Fix generator test
Also fix indentation (tabs bad)
2017-02-13 17:19:55 +10:30
Timothy Fosdike c719dff1ad Clear Ignore flag when StubWithCallback is called 2017-02-13 11:57:33 +10:30
Mark VanderVoord dda0351471 Make smarter guesses about memory alignment based on the size of long discovered by unity 2017-02-06 07:04:22 -05:00
Mark VanderVoord 29541c1e46 Merge pull request #107 from hmijail/master
Avoid possible Undefined Behavior
2017-02-02 12:42:37 -05:00
Mijail 8c8c2a2292 Avoid possible Undefined Behavior
(related to a possible negative zero, as reported by RV-Match)
2017-02-02 17:19:02 +01:00
Mark VanderVoord 29c1d07f25 Updated code to match Unity’s latest naming conventions 2016-11-29 08:58:15 -05:00
Mark VanderVoord be70af1297 Merge pull request #101 from d-led/master
C89 conforming declaration of `cmock_call_instance` (Thanks Dmitry!)
2016-11-28 13:50:18 -05:00
Dmitry Ledentsov cfe52ba90f fix the test 2016-11-28 19:34:59 +01:00
Dmitry Ledentsov b0264f68f4 editing in the browser...
forgotten comma
2016-11-28 17:15:51 +01:00
Dmitry Ledentsov 242fd73d3e C89 conforming declaration of `cmock_call_instance 2016-11-28 17:11:29 +01:00
Dmitry Ledentsov d59ec41c52 fixing the test for #100 2016-11-28 17:05:27 +01:00
Mark VanderVoord 52e89e9507 switch to latest unity / exception 2016-11-15 14:29:11 -05:00
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