1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00
Commit Graph

1279 Commits

Author SHA1 Message Date
Jonathan Reichelt Gjertsen
d06ac64852 Merge remote-tracking branch 'upstream/master' into more-float
# Conflicts:
#	README.md
#	docs/UnityAssertionsReference.md
2021-07-27 01:54:26 +02:00
Mark VanderVoord
aeed24c78b Merge pull request #570 from DanieleNardi/ExternCedIncludes
Support for mixed C/C++ environment. (Thanks @DanieleNardi  !)
2021-07-15 08:46:17 -04:00
Daniele Nardi
29617c7ecd Added -externcincludes option in order to build unit test executable in mixed C/C++ environment 2021-07-15 13:10:07 +02:00
Mark VanderVoord
2f7406572e Bump Version 2021-06-18 14:32:54 -04:00
Mark VanderVoord
e44c3b56f7 Adjust how decimal tracking handles to avoid warnings. 2021-06-03 08:51:24 -04:00
Mark VanderVoord
b63524d0fd Merge pull request #565 from wolf99/lint-markdown
Lint markdown (Thanks @wolf99 ! This is a great improvement!)
2021-06-03 07:16:18 -04:00
wolf99
00a1d02835 Break on sentences instead of column 2021-06-02 23:48:23 +01:00
wolf99
8b90b51c68 Reference style URLs 2021-06-02 23:13:14 +01:00
wolf99
d0b5a920bb markdown conformance 2021-06-02 22:49:03 +01:00
Mark VanderVoord
1a681340de Merge pull request #564 from BAUR-GmbH/master
Use stdnoreturn.h for c11 and [[ noreturn ]] for c++11. Fixes #563
2021-06-02 11:42:32 -04:00
Bernhard Breuß
f944b08878 Use stdnoreturn.h for c11 and [[ noreturn ]] for c++11. ThrowTheSwitch#563 2021-06-02 16:56:14 +02:00
Mark VanderVoord
bd3c7dfd0d Merge pull request #562 from kisvegabor/patch-1
Fix typo in UnityHelperScriptsGuide.md (Thanks @kisvegabor !)
2021-06-02 09:52:45 -04:00
Gabor Kiss-Vamosi
fa5644bd07 Fix typo in UnityHelperScriptsGuide.md
An `e` is missing in`suit_setup` in the `my_config.yml`.
2021-06-02 15:38:27 +02:00
Mark VanderVoord
7d37a8e11e Merge pull request #561 from druckdev/master
Support `UNITY_INCLUDE_EXEC_TIME` under Apples OSX
2021-05-31 11:04:01 -04:00
druckdev
edfc5ae355 Support UNITY_INCLUDE_EXEC_TIME under Apples OSX
The unix way of getting the time works under OSX as well and can be
used.
2021-05-31 12:55:37 +02:00
Jonathan Reichelt Gjertsen
410de1a02b Add macros for testing inequalities between floats, doubles 2021-05-24 17:02:58 +02:00
Jonathan Reichelt Gjertsen
27ef0eb44e Fix some formatting errors in the assertions reference 2021-05-24 14:52:24 +02:00
Erik Flodin
dc96c3e6dd Fix strict-overflow compiler warning
By replacing "x < y + 1" with "x <= y" the compiler doesn't have to do
it and the warning "assuming signed overflow does not occur when
reducing constant in comparison [-Werror=strict-overflow]" is avoided.
2021-04-17 19:00:06 +02:00
Erik Flodin
8e1e9c18ab Fix ruby style warnings as reported by rubocop 2021-04-15 22:22:33 +02:00
Peter Membrey
63ea077a29 Add some docs for the Meson generator 2021-04-04 22:14:28 +08:00
Peter Membrey
31f5b47fc5 Add generator code to build file and make script executable 2021-04-04 01:54:43 +08:00
Jannis Baudisch
77bd4f9943 Add test for function pointers in parameterized tests 2021-04-01 11:07:49 +02:00
Jannis Baudisch
b51303a65b Improve regex for test parameterization to support function pointers
The regex to match function names for the test parameterization used the
wildcard '.*'. This lead to an error when you try to add a function
pointer as arguement.

The regex will now only match the word characters a-z A-Z 0-9 and
underscore (which are all characers that are accepted by the C standard)
2021-04-01 10:29:22 +02:00
Fabian Zahn
4cfb39290a Refactor generator expressions for CMake 2021-02-27 11:14:43 +01:00
Fabian Zahn
fa32e530ba Remove "error: assuming signed overflow does not occur when reducing constant in comparison [-Werror=strict-overflow]" 2021-02-27 10:49:34 +01:00
Fabian Zahn
7edf9d9ac5 Fix #510 (-Wextra-semi-stmt with clang compiler) 2021-02-27 08:53:53 +01:00
Mark VanderVoord
61f4428435 Merge pull request #543 from farrrb/bugfix/fix-issue-531
Enable __attribute__ when __clang__ is definedgit
2021-02-26 13:01:42 -05:00
Fabian Zahn
0168ea1541 Enable __attribute__ when __clang__ is definedgit 2021-02-26 18:46:27 +01:00
Mark VanderVoord
ccd7ca72f3 Merge pull request #542 from farrrb/patch-1
Update UnityConfigurationGuide.md
2021-02-26 07:38:47 -05:00
Fabian Zahn - 0xFAB
66cec22838 Update UnityConfigurationGuide.md
Add semi-colon to configuration :)
2021-02-26 07:51:57 +01:00
Mark VanderVoord
74cde089e6 Merge pull request #540 from numaru/master
Enlarge the TEST_RANGE() regex to accept more spaces (Thanks for the help, @numaru !)
2021-02-12 15:42:25 -05:00
Kin Numaru
63fef7dd10 Enlarge the TEST_RANGE() regex to accept more spaces
This commit change the regex to accept more spaces inside the brackets
of the TEST_RANGE().

I use clang-format through vscode "editor.formatOnSave": true feature and it produce
padding spaces inside the array brackets by default.

```c
int a[] = [1, 2];
```

is changed into

```c
int a[] = [ 1, 2 ];
```

Also, every time I save a file containing a TEST_RANGE() with ctrl + s,
it breaks it.
2021-02-12 20:39:05 +01:00
Mark VanderVoord
78dea55ba5 Merge pull request #539 from Borowiec-B/master
Fix typo in doc (Thanks Michael!)
2021-02-10 09:28:45 -05:00
throwaway47912
563b93e5ec Fix typo in doc 2021-02-10 15:20:03 +01:00
Mark VanderVoord
0b899aec14 Fix conditional issue in generator script.
Bump version.
v2.5.2
2021-01-26 08:59:27 -05:00
Mark VanderVoord
d8eb8414f4 Stop noticing my sublime files. ;) 2021-01-16 21:20:09 -05:00
Mark VanderVoord
05994f5061 Merge pull request #536 from ThrowTheSwitch/test/switch_to_actions
Attempt to get Actions Working
2021-01-16 21:05:49 -05:00
Mark VanderVoord
fcab680286 Ruby script cleanup.
Fix warnings.
Remove 32-bit tests from standard suite because they're not running on most platforms.
2021-01-16 21:03:18 -05:00
Mark VanderVoord
3c1c5338af Need to checkout.
Drop Slack support
2021-01-16 20:27:49 -05:00
Mark VanderVoord
9e7c259822 Do we need to be admin to install gems? 2021-01-16 20:19:29 -05:00
Mark VanderVoord
ce132da37f Merge pull request #535 from ThrowTheSwitch/test/switch_to_actions
Switch from Travis to Github Actions.
2021-01-16 20:15:22 -05:00
Mark VanderVoord
ffb51ecb7e Switch from Travis to Github Actions.
Update year in docs.
2021-01-16 20:05:20 -05:00
Mark VanderVoord
0b078cdb6e Merge pull request #533 from carsonalh/master
Fixed CMake install when compiled with extensions
2021-01-08 09:01:41 -05:00
Carson Holloway
53e1449f89 Fixed CMake install when compiled with extensions
This is a fix from the change I made in
`commit 418c1635f2f1bcd353b6fce23a16594c914047b8`
where I added options to compile unity with the `fixture` and `memory`
extensions:

In that version, Unity had been able to build, but there were some issues when
trying to install it. Namely, the CMake generator expressions were not
evaluated correctly, and it would try to install with a path that had
un-expanded generator commands in it, which would obviously fail and throw an
error. I've got a feeling that this is a bug with CMake, but for now the
workaround that worked in [this stackoverflow
post](https://stackoverflow.com/questions/51541678/nested-cmake-generator-expressions-are-only-partially-evaluated)
seemed to work here, as well.

Another issue with that commit was that it tried to include a
`unity_memory_internals.h` file, which did not exist. This has also been
resolved.
2021-01-08 10:34:38 +10:00
Mark VanderVoord
830f77f9ee Merge pull request #509 from alecoding/issue_507
Fix warning for issue #507
2021-01-07 18:08:51 -05:00
Mark VanderVoord
038dd81213 Merge pull request #520 from softwareinmotion/runner_mock_suffix
parse mock files correctly
2021-01-07 18:08:09 -05:00
Mark VanderVoord
99fb90a939 Merge pull request #522 from JuPrgn/master
Add guard TEST on test module template
2021-01-07 18:05:48 -05:00
Mark VanderVoord
b7469138a5 Merge pull request #530 from carsonalh/master
Added options to compile "fixture" and "memory" extensions in CMakeLists
2021-01-07 18:05:05 -05:00
Carson Holloway
418c1635f2 Added option to compile fixture and memory extensions in CMakeLists.txt 2020-12-20 12:58:11 +11:00
Mark VanderVoord
386c540510 Merge pull request #524 from sardior/exlude-details-compile-fix
Update unity.c
2020-10-12 08:36:48 -04:00