Commit Graph

  • 153653478b Fixed travis CI build status image in README.md Greg Williams 2014-07-25 16:17:22 -0400
  • b4987375c7 Deleted old rakefile.rb Greg Williams 2014-07-25 13:13:36 -0700
  • e4098dba9a Added gcc version specific fix for pragma ignores Greg Williams 2014-07-25 16:07:55 -0400
  • 7d72a32271 Fixed rake invocation in .travis.yml Greg Williams 2014-07-25 15:30:35 -0400
  • 856dea46fa README fixes Greg Williams 2014-07-25 15:28:34 -0400
  • d6b0aea0b3 Added .md extension to README Greg Williams 2014-07-25 15:17:31 -0400
  • be7be41580 Updated to latest version of Unity. Removed -Wno-duplicate-decl-specifier flag from all YAML files, since unsupported in some versions of gcc. Reimplemented ignore in specific files and generated code using a pragmas instead, which are setup to ignore undefined pragma values. Added initial .travis.yml file for TravisCI builds. Greg Williams 2014-07-25 15:13:29 -0400
  • f597ba92a9 revert cmock_line change because it was breaking on some systems handle filenames with dashes and whatnot when creating header definition name Mark VanderVoord 2014-07-09 09:05:48 -0400
  • a32b1e1370 add unit tests proving strippables work. Mark VanderVoord 2014-06-06 10:02:16 -0400
  • a4f7a700ff Properly handle functions returning constant pointer [ex: int *const Func()]. This fixes compiler warning/errors about prototypes that don't match. This also fixes where 'modifier' of a function contains 'const const' for functions like 'const int * const MyFunc()' Jocelyn Le Sage 2014-05-23 14:15:35 -0400
  • a4a67519d1 cleanup to follow a more strict C standard Mark VanderVoord 2014-05-23 11:23:44 -0400
  • 9d76de27d3 Replace a Windows-specific double backslash with a portable slash in cmock.rb Paul Watson 2014-05-23 13:39:25 +0100
  • e3e443f274 Added configuration item to specify how to include the original header file. This is useful when mocking a header file that is not local. For example, if the header file to mock is accessible from <mymodule/myfile.h>, one could set the include format to '<mymodule/%s>'. The default format is '"%s"', which keep the previous behavior. Jocelyn Le Sage 2014-05-23 07:28:54 -0400
  • 4963830400 Converting file separator in mkdir calls to the portable '/' rather than the Windows-specific '\\'. Paul Watson 2014-05-22 17:00:31 +0100
  • b07e713eb0 Merge pull request #36 from jlesage/strippables_regex_fix2 Mark VanderVoord 2014-05-22 10:18:21 -0400
  • 4a4dedd5e2 Adjust source file to be able to properly strip macros when using strippables. Jocelyn Le Sage 2014-05-22 09:14:25 -0400
  • 1756e4bb17 Merge pull request #35 from jlesage/options_fix Mark VanderVoord 2014-05-22 08:57:23 -0400
  • 3def9e6011 Properly merge options. Jocelyn Le Sage 2014-05-22 08:49:58 -0400
  • dfc238ea94 Merge pull request #33 from jlesage/cast_return_type Mark VanderVoord 2014-05-22 08:01:20 -0400
  • 5d79cf8e56 Merge pull request #34 from jlesage/reset_ignore_bool Mark VanderVoord 2014-05-22 07:59:57 -0400
  • 19f0bb89b6 Make sure *_IgnoreBool is (re)set to 0 when adding base expectations. This way, a call to *_IgnoreAndReturn() followed by a call to *_ExpectAndReturn() is properly handled (i.e. the function will not be ignored, as instructed by the last statement). Jocelyn Le Sage 2014-05-22 06:49:07 -0400
  • 5c07c70e93 Fixed another 'return from incompatible pointer type' compiler warning generated by ExpectAnyArgs plugin. Jocelyn Le Sage 2014-05-22 06:00:06 -0400
  • f357e19765 update to latest unity Mark VanderVoord 2014-05-21 20:13:43 -0400
  • efcd13d3aa Make sure CMock releases its dynamically allocated memory at the end of the entire suite. Mark VanderVoord 2014-05-21 19:23:18 -0400
  • e835ad9c9d Fix error where we would get errors if we IgnoredAndReturned a function and then never called it. stupid eh? ( thanks for bringing this up, smaankers) Mark VanderVoord 2014-05-21 16:48:27 -0400
  • 80735f2dbe Merge 5929dda78a into e42f10ebc2 Jocelyn Le Sage 2014-05-21 20:35:35 +0000
  • e42f10ebc2 Fixed usage of ReturnThruPtr when also using ExpectAnyArgs (thanks for noticing this one, jlesage) Mark VanderVoord 2014-05-21 16:34:18 -0400
  • 85fa655023 - cmock now accepts any combo of yaml and command line options, applying them in the order they appear on the command line (thanks kylebhamilton for the suggestion!) Mark VanderVoord 2014-05-21 15:26:43 -0400
  • c1da6694ba Merge adf25e6d42 into 11db2a22a3 Jocelyn Le Sage 2014-05-09 17:02:31 +0000
  • adf25e6d42 Adjusted regex for strippables: usually, characters following the pattern to strip are expected to be non-alphanumeric. However, alphanumeric characters should be allowed if last character of the pattern to strip is non-alphanumeric. Jocelyn Le Sage 2014-05-09 12:46:41 -0400
  • 11db2a22a3 * If people are asking us to do things like "const char const *", then we shouldn't further complain about it. Mark VanderVoord 2014-05-08 14:43:07 -0400
  • 6f327db56c Merge pull request #30 from jlesage/compiler_warning_fix Mark VanderVoord 2014-05-08 14:41:19 -0400
  • ca13c8361c Better way to fix a 'return from incompatible pointer type' compiler warning for const return types. Jocelyn Le Sage 2014-05-08 14:20:22 -0400
  • b9b68bd26c - fixed broken tests introduced by Jocelyn's changes (oops. I should have checked that) - reverted casting change, because it produces many pedantic C errors. Mark VanderVoord 2014-05-07 15:57:08 -0400
  • db3ff131a5 Merge pull request #28 from jlesage/master_for_pull_request2 Mark VanderVoord 2014-05-06 09:56:48 -0400
  • 2160552c00 Merge pull request #29 from jlesage/master_for_pull_request3 Mark VanderVoord 2014-05-06 09:53:42 -0400
  • 8bd739e9bb Fixed 'unused variable `cmock_line' compiler warning. Warning was produced by generated code for functions without args. Jocelyn Le Sage 2014-05-06 08:45:07 -0400
  • fbda0d96f6 Fixed 'return from incompatible pointer type' compiler warnings that were produced by generated code for functions having 'const ptr' has return value. Jocelyn Le Sage 2014-05-06 08:39:24 -0400
  • 027648a9b2 Properly mark the 'const' state of a fonction's return type. Jocelyn Le Sage 2014-05-06 08:27:31 -0400
  • 5929dda78a Fixed problem where 'ReturnThruPtr' statements were ignored with the use of 'ExpectAnyArgs'. In the mocked function implementation, do not return when 'ignore mode' is CMOCK_ARG_NONE. Instead, jump after evaluation of argument expectations. This allows execution of code that returns data through arguments. Jocelyn Le Sage 2014-05-02 14:21:20 -0400
  • 053c3b67f1 use latest unity Mark VanderVoord 2014-05-01 15:53:13 -0400
  • e15b82127b fix errors in attribute parsing reject definitions in header files beef up tests to prove both of these work without any extra external help Mark VanderVoord 2014-04-22 13:19:50 -0400
  • 0e3d0fd1d5 pull in latest unity Mark VanderVoord 2014-04-21 17:02:09 -0400
  • 335c0bd48c don't use any Ruby 1.9-only notation in the encoding call Mark VanderVoord 2014-04-21 16:16:07 -0400
  • 673b8072c0 Change to use platform independent path separators when working out which files to parse mikeb 2014-04-17 17:21:41 +0100
  • 7f4d5c7306 Fixed symbol loading when using direct command line arguments Mark VanderVoord 2014-04-15 11:34:02 -0400
  • 1f7e797bdd Replacing \s with \S in macro exclusion regex so that it actually works. mikeb 2014-03-18 10:42:47 +0000
  • 55ca7b8f03 Stopping us parsing macros taking arguments. These could contain other macros which were being treated as function headers and failing to parse. mikeb 2014-03-17 18:20:32 +0000
  • fcc6a40581 resolved conflicts Mark VanderVoord 2014-03-17 11:14:32 -0400
  • 4f2dd38b6c Merge branch 'master' of https://github.com/ThrowTheSwitch/CMock Mark VanderVoord 2014-03-17 10:52:13 -0400
  • 2e3744f748 Update to latest version of Unity Mark VanderVoord 2014-03-13 16:23:29 -0400
  • d0d87d9436 Fixed "comparison between pointer and integer" resulting from bad arg expectation assert generation. Dennis Lambe Jr 2014-03-08 23:05:51 -0500
  • c083b518ac Replaced class-level aliasing of code_verify_an_arg_expectation with instance-level dispatch. Fixed a bug in code_verify_an_arg_expectation_with_no_arrays which was being hidden from the unit tests by aliasing. Dennis Lambe Jr 2014-03-08 22:20:28 -0500
  • ba6a52b8de updated the documents to include all plugins and some other minor tweaks. Mark VanderVoord 2014-02-28 15:08:38 -0500
  • 26b3f6ef65 Fix encoding issues for anyone using a somewhat modern Ruby (1.9 or greater) Mark VanderVoord 2014-02-28 10:58:57 -0500
  • a432aa3436 Update to latest version of Unity Mark VanderVoord 2014-03-13 16:23:29 -0400
  • 31ae10b470 Merge pull request #24 from malsyned/assert_fixes Mark VanderVoord 2014-03-09 13:57:04 -0400
  • b829be67b3 Fixed "comparison between pointer and integer" resulting from bad arg expectation assert generation. Dennis Lambe Jr 2014-03-08 23:05:51 -0500
  • 93d812d528 Replaced class-level aliasing of code_verify_an_arg_expectation with instance-level dispatch. Fixed a bug in code_verify_an_arg_expectation_with_no_arrays which was being hidden from the unit tests by aliasing. Dennis Lambe Jr 2014-03-08 22:20:28 -0500
  • 5db3725d30 Merge pull request #21 from ThrowTheSwitch/bug/encoding Mark VanderVoord 2014-03-07 15:57:57 -0500
  • 5547caf0ee slightly better system testing Mark VanderVoord 2014-03-03 20:45:54 -0500
  • 9375b6b2d2 fix broken unit tests Mark VanderVoord 2014-03-03 20:37:27 -0500
  • 503119fdee fixed a minor error that was giving me extra warnings Mark VanderVoord 2014-03-03 19:41:35 -0500
  • 86594eea25 * split :args_only feature from :ignore plugin to be its own :expect_any_args plugin * made :expect_any_args work with intermixed expects the way you would think it should work. Mark VanderVoord 2014-03-03 19:28:50 -0500
  • f6ef81c269 updated the documents to include all plugins and some other minor tweaks. Mark VanderVoord 2014-02-28 15:08:38 -0500
  • 85ce6b2513 Fix encoding issues for anyone using a somewhat modern Ruby (1.9 or greater) Mark VanderVoord 2014-02-28 10:58:57 -0500
  • e4246f1046 Merge 6bfe7ce784 into 5d7cf7905f Mark VanderVoord 2014-02-28 10:52:53 -0500
  • 6bfe7ce784 capture user's expectations as system tests so that we can fix them soon Mark VanderVoord 2014-02-28 09:13:09 -0500
  • cf9961f81e - add tests to prove that args_only ignores are working as desired. Mark VanderVoord 2014-02-28 09:03:28 -0500
  • 5d7cf7905f I'm stupid. This wasn't meant to be in the repo Mark VanderVoord 2014-02-28 08:23:47 -0500
  • 5f5ef77092 verify yet more function pointer calls Mark VanderVoord 2014-02-28 08:21:10 -0500
  • e4cfc7eba6 Switching from string matching to regex to determine if file is in genlib mikeb 2014-02-26 09:56:26 +0000
  • b9457bdd49 Hopefully really not altering mapgenlib mikeb 2014-02-25 18:27:52 +0000
  • 1a2148087b copy and paste error fix 'header' -> 'source' mikeb 2014-02-25 18:15:45 +0000
  • 80383995cd Adding needed #endifs to gen_intrinsics.c and making check for genlib ,more specific so it does not alter mapgenlib mikeb 2014-02-25 18:13:01 +0000
  • 262db12852 Allowing wrapping of genlib mikeb 2014-02-25 17:11:40 +0000
  • 93ab94532c Merge pull request #19 from lgreve/remove_multi_line_typedefs Mark VanderVoord 2014-02-24 09:00:50 -0500
  • 80a57b436c Remove until a semicolon is found when removing typedefs Lucas Greve 2014-02-23 17:41:57 -0700
  • 5f6490c370 Remove escaped newline from multiline typedef test Lucas Greve 2014-02-23 17:41:24 -0700
  • bb5fd622c3 * added ability to pass most options through the command line directly (see doc updates) Mark VanderVoord 2013-10-01 08:26:13 -0400
  • 342e1d7cce merge in small fix to avoid renaming problems Mark VanderVoord 2013-09-22 12:28:41 -0400
  • 7c35571599 Merge pull request #14 from canton7/feature/test-on-other-platforms Mark VanderVoord 2013-06-28 04:54:43 -0700
  • db4c8c0b45 Merge 26191e604f into ad5f0caec1 Antony Male 2013-06-28 04:24:37 -0700
  • 26191e604f Edit TestCMockC.c so it will (mostly) run on 16-bit platforms. Antony Male 2013-06-28 12:14:04 +0100
  • f3011f6368 PRIS-1486: Fixes to accomodate preprocessor directives. unknown 2013-03-14 11:26:02 +0000
  • 1b4d2928f8 PRIS-1147: Corrections to cmock for mock generation. unknown 2013-01-11 17:36:53 +0000
  • dd6e992e2c Merge ff4966bf42 into ad5f0caec1 Jordan S 2013-01-08 21:03:34 -0800
  • ad5f0caec1 Merge pull request #9 from malsyned/return_thru_ptr Greg Williams 2012-12-21 06:19:49 -0800
  • 5708a1e34a Merge 1547097028 into 369b5bcc64 malsyned 2012-12-20 21:11:46 -0800
  • 1547097028 Added system integration tests for return_thru_ptr and ignore_arg plugins Dennis Lambe Jr 2012-12-20 23:59:14 -0500
  • 86a664e4f6 Added unit test for new CMock_Guts_MemEndOfChain() C function Dennis Lambe Jr 2012-12-20 18:06:48 -0500
  • 08c1216eab Added unit tests for return_thru_ptr and ignore_arg plugins Dennis Lambe Jr 2012-12-20 17:26:38 -0500
  • b2bdc5f476 Added tests for new generator_util function ptr_or_str? Dennis Lambe Jr 2012-12-20 15:14:43 -0500
  • 861cf07194 Added testing for return_thru_ptr and ignore_arg support in cmock_generator_utils.rb Dennis Lambe Jr 2012-12-20 14:33:54 -0500
  • 7239d815af Ensure tests pass after adding return_thru_ptr and ignore_arg plugins Dennis Lambe Jr 2012-12-19 20:19:17 -0500
  • 932785fd71 Added the return_thru_ptr and ignore_arg plugins Dennis Lambe Jr 2012-12-19 19:06:10 -0500
  • b29120fa85 Added system test case for module name sanitizing Dennis Lambe Jr 2012-12-19 14:21:30 -0500
  • 59873c9a05 PRIS-415: Reattempting submit unknown 2012-12-19 11:51:28 +0000
  • 4e120e8259 PRIS-415: Changes to cmock for callback resets unknown 2012-12-19 11:46:24 +0000
  • 369b5bcc64 Reverting force_encoding. John Van Enk 2012-11-27 10:37:56 -0500