ceedling 0.17.0 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ceedling.gemspec +1 -1
- data/lib/ceedling/version.rb +2 -2
- data/lib/ceedling/version.rb.erb +1 -2
- data/test_graveyard/unit/busted/generator_test_runner_test.rb +2 -5
- data/vendor/cmock/Gemfile +1 -3
- data/vendor/cmock/Rakefile +10 -17
- data/vendor/cmock/docs/license.txt +18 -30
- data/vendor/cmock/examples/gcc.yml +2 -2
- data/vendor/cmock/examples/iar_v4.yml +3 -3
- data/vendor/cmock/examples/iar_v5.yml +3 -3
- data/vendor/cmock/examples/rakefile_helper.rb +35 -35
- data/vendor/cmock/lib/cmock_generator.rb +17 -5
- data/vendor/cmock/lib/cmock_generator_plugin_array.rb +9 -3
- data/vendor/cmock/lib/cmock_generator_plugin_ignore_arg.rb +1 -1
- data/vendor/cmock/lib/cmock_generator_plugin_return_thru_ptr.rb +1 -1
- data/vendor/cmock/lib/cmock_header_parser.rb +7 -3
- data/vendor/cmock/release/version.info +1 -1
- data/vendor/cmock/test/c/TestCMockCDynamic_Runner.c +1 -2
- data/vendor/cmock/test/c/TestCMockC_Runner.c +1 -1
- data/vendor/cmock/test/system/systest_generator.rb +6 -2
- data/vendor/cmock/test/system/test_compilation/const.h +3 -1
- data/vendor/cmock/test/test_helper.rb +38 -40
- data/vendor/cmock/test/unit/cmock_config_test.rb +26 -29
- data/vendor/cmock/test/unit/cmock_file_writer_test.rb +8 -11
- data/vendor/cmock/test/unit/cmock_generator_main_test.rb +82 -80
- data/vendor/cmock/test/unit/cmock_generator_plugin_array_test.rb +62 -43
- data/vendor/cmock/test/unit/cmock_generator_plugin_callback_test.rb +44 -45
- data/vendor/cmock/test/unit/cmock_generator_plugin_cexception_test.rb +30 -31
- data/vendor/cmock/test/unit/cmock_generator_plugin_expect_any_args_test.rb +15 -16
- data/vendor/cmock/test/unit/cmock_generator_plugin_expect_test.rb +76 -77
- data/vendor/cmock/test/unit/cmock_generator_plugin_ignore_arg_test.rb +19 -19
- data/vendor/cmock/test/unit/cmock_generator_plugin_ignore_test.rb +17 -18
- data/vendor/cmock/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb +17 -17
- data/vendor/cmock/test/unit/cmock_generator_utils_test.rb +74 -65
- data/vendor/cmock/test/unit/cmock_header_parser_test.rb +103 -76
- data/vendor/cmock/test/unit/cmock_plugin_manager_test.rb +46 -36
- data/vendor/cmock/test/unit/cmock_unityhelper_parser_test.rb +85 -85
- data/vendor/unity/auto/generate_test_runner.rb +4 -3
- data/vendor/unity/auto/type_sanitizer.rb +8 -0
- data/vendor/unity/auto/unity_test_summary.py +135 -0
- data/vendor/unity/examples/example_1/makefile +16 -0
- data/vendor/unity/examples/example_1/src/ProductionCode2.c +2 -0
- data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +0 -13
- data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +0 -13
- data/vendor/unity/examples/example_2/makefile +20 -1
- data/vendor/unity/examples/example_2/src/ProductionCode2.c +2 -0
- data/vendor/unity/examples/example_2/test/test_runners/all_tests.c +2 -2
- data/vendor/unity/examples/example_3/makefile +16 -0
- data/vendor/unity/examples/example_3/src/ProductionCode2.c +2 -0
- data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode2_Runner.c +0 -13
- data/vendor/unity/examples/example_3/test/no_ruby/TestProductionCode_Runner.c +0 -13
- data/vendor/unity/extras/fixture/rakefile.rb +14 -3
- data/vendor/unity/extras/fixture/src/unity_fixture.c +21 -11
- data/vendor/unity/extras/fixture/src/unity_fixture.h +8 -4
- data/vendor/unity/extras/fixture/src/unity_fixture_internals.h +1 -1
- data/vendor/unity/extras/fixture/src/unity_fixture_malloc_overrides.h +5 -0
- data/vendor/unity/extras/fixture/test/main/AllTests.c +2 -2
- data/vendor/unity/extras/fixture/test/unity_fixture_Test.c +8 -8
- data/vendor/unity/extras/fixture/test/unity_output_Spy.c +2 -2
- data/vendor/unity/extras/fixture/test/unity_output_Spy.h +2 -2
- data/vendor/unity/release/version.info +1 -1
- data/vendor/unity/src/unity.c +26 -19
- data/vendor/unity/src/unity_internals.h +9 -12
- data/vendor/unity/test/targets/gcc_auto_stdint.yml +13 -0
- metadata +4 -5
- data/vendor/cmock/test/spec/cmock_file_writer_spec.rb +0 -45
- data/vendor/cmock/test/spec/cmock_generator_plugin_array_spec.rb +0 -52
- data/vendor/cmock/test/spec/spec_helper.rb +0 -12
@@ -13,19 +13,22 @@
|
|
13
13
|
#include "unity_fixture_malloc_overrides.h"
|
14
14
|
#include "unity_fixture_internals.h"
|
15
15
|
|
16
|
-
int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
|
16
|
+
int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
|
17
17
|
|
18
18
|
|
19
19
|
#define TEST_GROUP(group)\
|
20
20
|
static const char* TEST_GROUP_##group = #group
|
21
21
|
|
22
|
-
#define TEST_SETUP(group) void TEST_##group##_SETUP(void)
|
22
|
+
#define TEST_SETUP(group) void TEST_##group##_SETUP(void);\
|
23
|
+
void TEST_##group##_SETUP(void)
|
23
24
|
|
24
|
-
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void)
|
25
|
+
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void);\
|
26
|
+
void TEST_##group##_TEAR_DOWN(void)
|
25
27
|
|
26
28
|
|
27
29
|
#define TEST(group, name) \
|
28
30
|
void TEST_##group##_##name##_(void);\
|
31
|
+
void TEST_##group##_##name##_run(void);\
|
29
32
|
void TEST_##group##_##name##_run(void)\
|
30
33
|
{\
|
31
34
|
UnityTestRunner(TEST_##group##_SETUP,\
|
@@ -39,6 +42,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
|
|
39
42
|
|
40
43
|
#define IGNORE_TEST(group, name) \
|
41
44
|
void TEST_##group##_##name##_(void);\
|
45
|
+
void TEST_##group##_##name##_run(void);\
|
42
46
|
void TEST_##group##_##name##_run(void)\
|
43
47
|
{\
|
44
48
|
UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
|
@@ -60,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
|
|
60
64
|
{\
|
61
65
|
TEST_##group##_GROUP_RUNNER_runAll();\
|
62
66
|
}\
|
63
|
-
void TEST_##group##_GROUP_RUNNER_runAll()
|
67
|
+
void TEST_##group##_GROUP_RUNNER_runAll(void)
|
64
68
|
|
65
69
|
//Call this from main
|
66
70
|
#define RUN_TEST_GROUP(group)\
|
@@ -29,7 +29,7 @@ void UnityIgnoreTest(const char * printableName);
|
|
29
29
|
void UnityMalloc_StartTest(void);
|
30
30
|
void UnityMalloc_EndTest(void);
|
31
31
|
int UnityFailureCount(void);
|
32
|
-
int UnityGetCommandLineOptions(int argc, char* argv[]);
|
32
|
+
int UnityGetCommandLineOptions(int argc, const char* argv[]);
|
33
33
|
void UnityConcludeFixtureTest(void);
|
34
34
|
|
35
35
|
void UnityPointer_Set(void ** ptr, void * newValue);
|
@@ -13,4 +13,9 @@
|
|
13
13
|
#define realloc unity_realloc
|
14
14
|
#define free unity_free
|
15
15
|
|
16
|
+
void* unity_malloc(size_t size);
|
17
|
+
void* unity_calloc(size_t num, size_t size);
|
18
|
+
void* unity_realloc(void * oldMem, size_t size);
|
19
|
+
void unity_free(void * mem);
|
20
|
+
|
16
21
|
#endif /* UNITY_FIXTURE_MALLOC_OVERRIDES_H_ */
|
@@ -7,14 +7,14 @@
|
|
7
7
|
|
8
8
|
#include "unity_fixture.h"
|
9
9
|
|
10
|
-
static void runAllTests()
|
10
|
+
static void runAllTests(void)
|
11
11
|
{
|
12
12
|
RUN_TEST_GROUP(UnityFixture);
|
13
13
|
RUN_TEST_GROUP(UnityCommandOptions);
|
14
14
|
RUN_TEST_GROUP(LeakDetection)
|
15
15
|
}
|
16
16
|
|
17
|
-
int main(int argc, char* argv[])
|
17
|
+
int main(int argc, const char* argv[])
|
18
18
|
{
|
19
19
|
return UnityMain(argc, argv, runAllTests);
|
20
20
|
}
|
@@ -158,7 +158,7 @@ TEST_TEAR_DOWN(UnityCommandOptions)
|
|
158
158
|
}
|
159
159
|
|
160
160
|
|
161
|
-
static char* noOptions[] = {
|
161
|
+
static const char* noOptions[] = {
|
162
162
|
"testrunner.exe"
|
163
163
|
};
|
164
164
|
|
@@ -171,7 +171,7 @@ TEST(UnityCommandOptions, DefaultOptions)
|
|
171
171
|
TEST_ASSERT_EQUAL(1, UnityFixture.RepeatCount);
|
172
172
|
}
|
173
173
|
|
174
|
-
static char* verbose[] = {
|
174
|
+
static const char* verbose[] = {
|
175
175
|
"testrunner.exe",
|
176
176
|
"-v"
|
177
177
|
};
|
@@ -182,7 +182,7 @@ TEST(UnityCommandOptions, OptionVerbose)
|
|
182
182
|
TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
|
183
183
|
}
|
184
184
|
|
185
|
-
static char* group[] = {
|
185
|
+
static const char* group[] = {
|
186
186
|
"testrunner.exe",
|
187
187
|
"-g", "groupname"
|
188
188
|
};
|
@@ -193,7 +193,7 @@ TEST(UnityCommandOptions, OptionSelectTestByGroup)
|
|
193
193
|
STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
|
194
194
|
}
|
195
195
|
|
196
|
-
static char* name[] = {
|
196
|
+
static const char* name[] = {
|
197
197
|
"testrunner.exe",
|
198
198
|
"-n", "testname"
|
199
199
|
};
|
@@ -204,7 +204,7 @@ TEST(UnityCommandOptions, OptionSelectTestByName)
|
|
204
204
|
STRCMP_EQUAL("testname", UnityFixture.NameFilter);
|
205
205
|
}
|
206
206
|
|
207
|
-
static char* repeat[] = {
|
207
|
+
static const char* repeat[] = {
|
208
208
|
"testrunner.exe",
|
209
209
|
"-r", "99"
|
210
210
|
};
|
@@ -221,7 +221,7 @@ TEST(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount)
|
|
221
221
|
TEST_ASSERT_EQUAL(99, UnityFixture.RepeatCount);
|
222
222
|
}
|
223
223
|
|
224
|
-
static char* multiple[] = {
|
224
|
+
static const char* multiple[] = {
|
225
225
|
"testrunner.exe",
|
226
226
|
"-v",
|
227
227
|
"-g", "groupname",
|
@@ -238,7 +238,7 @@ TEST(UnityCommandOptions, MultipleOptions)
|
|
238
238
|
TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
|
239
239
|
}
|
240
240
|
|
241
|
-
static char* dashRNotLast[] = {
|
241
|
+
static const char* dashRNotLast[] = {
|
242
242
|
"testrunner.exe",
|
243
243
|
"-v",
|
244
244
|
"-g", "gggg",
|
@@ -255,7 +255,7 @@ TEST(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified)
|
|
255
255
|
TEST_ASSERT_EQUAL(2, UnityFixture.RepeatCount);
|
256
256
|
}
|
257
257
|
|
258
|
-
static char* unknownCommand[] = {
|
258
|
+
static const char* unknownCommand[] = {
|
259
259
|
"testrunner.exe",
|
260
260
|
"-v",
|
261
261
|
"-g", "groupname",
|
@@ -25,7 +25,7 @@ void UnityOutputCharSpy_Create(int s)
|
|
25
25
|
memset(buffer, 0, size);
|
26
26
|
}
|
27
27
|
|
28
|
-
void UnityOutputCharSpy_Destroy()
|
28
|
+
void UnityOutputCharSpy_Destroy(void)
|
29
29
|
{
|
30
30
|
size = 0;
|
31
31
|
free(buffer);
|
@@ -45,7 +45,7 @@ int UnityOutputCharSpy_OutputChar(int c)
|
|
45
45
|
return c;
|
46
46
|
}
|
47
47
|
|
48
|
-
const char * UnityOutputCharSpy_Get()
|
48
|
+
const char * UnityOutputCharSpy_Get(void)
|
49
49
|
{
|
50
50
|
return buffer;
|
51
51
|
}
|
@@ -9,9 +9,9 @@
|
|
9
9
|
#define D_unity_output_Spy_H
|
10
10
|
|
11
11
|
void UnityOutputCharSpy_Create(int s);
|
12
|
-
void UnityOutputCharSpy_Destroy();
|
12
|
+
void UnityOutputCharSpy_Destroy(void);
|
13
13
|
int UnityOutputCharSpy_OutputChar(int c);
|
14
|
-
const char * UnityOutputCharSpy_Get();
|
14
|
+
const char * UnityOutputCharSpy_Get(void);
|
15
15
|
void UnityOutputCharSpy_Enable(int enable);
|
16
16
|
|
17
17
|
#endif
|
@@ -1,2 +1,2 @@
|
|
1
|
-
2.
|
1
|
+
2.2.0
|
2
2
|
|
data/vendor/unity/src/unity.c
CHANGED
@@ -271,7 +271,7 @@ void UnityPrintOk(void)
|
|
271
271
|
}
|
272
272
|
|
273
273
|
//-----------------------------------------------
|
274
|
-
void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
|
274
|
+
static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
|
275
275
|
{
|
276
276
|
UnityPrint(file);
|
277
277
|
UNITY_OUTPUT_CHAR(':');
|
@@ -282,7 +282,7 @@ void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
|
|
282
282
|
}
|
283
283
|
|
284
284
|
//-----------------------------------------------
|
285
|
-
void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
|
285
|
+
static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
|
286
286
|
{
|
287
287
|
UnityTestResultsBegin(Unity.TestFile, line);
|
288
288
|
UnityPrint(UnityStrFail);
|
@@ -312,7 +312,7 @@ void UnityConcludeTest(void)
|
|
312
312
|
}
|
313
313
|
|
314
314
|
//-----------------------------------------------
|
315
|
-
void UnityAddMsgIfSpecified(const char* msg)
|
315
|
+
static void UnityAddMsgIfSpecified(const char* msg)
|
316
316
|
{
|
317
317
|
if (msg)
|
318
318
|
{
|
@@ -322,7 +322,7 @@ void UnityAddMsgIfSpecified(const char* msg)
|
|
322
322
|
}
|
323
323
|
|
324
324
|
//-----------------------------------------------
|
325
|
-
void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
|
325
|
+
static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
|
326
326
|
{
|
327
327
|
UnityPrint(UnityStrExpected);
|
328
328
|
if (expected != NULL)
|
@@ -352,7 +352,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
|
|
352
352
|
// Assertion & Control Helpers
|
353
353
|
//-----------------------------------------------
|
354
354
|
|
355
|
-
int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg)
|
355
|
+
static int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg)
|
356
356
|
{
|
357
357
|
//return true if they are both NULL
|
358
358
|
if ((expected == NULL) && (actual == NULL))
|
@@ -481,15 +481,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
|
|
481
481
|
case UNITY_DISPLAY_STYLE_UINT16:
|
482
482
|
while (elements--)
|
483
483
|
{
|
484
|
-
if (*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act)
|
484
|
+
if (*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act)
|
485
485
|
{
|
486
486
|
UnityTestResultsFailBegin(lineNumber);
|
487
487
|
UnityPrint(UnityStrElement);
|
488
488
|
UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
|
489
489
|
UnityPrint(UnityStrExpected);
|
490
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp, style);
|
490
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp, style);
|
491
491
|
UnityPrint(UnityStrWas);
|
492
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act, style);
|
492
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act, style);
|
493
493
|
UnityAddMsgIfSpecified(msg);
|
494
494
|
UNITY_FAIL_AND_BAIL;
|
495
495
|
}
|
@@ -503,15 +503,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
|
|
503
503
|
case UNITY_DISPLAY_STYLE_UINT64:
|
504
504
|
while (elements--)
|
505
505
|
{
|
506
|
-
if (*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act)
|
506
|
+
if (*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act)
|
507
507
|
{
|
508
508
|
UnityTestResultsFailBegin(lineNumber);
|
509
509
|
UnityPrint(UnityStrElement);
|
510
510
|
UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
|
511
511
|
UnityPrint(UnityStrExpected);
|
512
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp, style);
|
512
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp, style);
|
513
513
|
UnityPrint(UnityStrWas);
|
514
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act, style);
|
514
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act, style);
|
515
515
|
UnityAddMsgIfSpecified(msg);
|
516
516
|
UNITY_FAIL_AND_BAIL;
|
517
517
|
}
|
@@ -523,15 +523,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
|
|
523
523
|
default:
|
524
524
|
while (elements--)
|
525
525
|
{
|
526
|
-
if (*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act)
|
526
|
+
if (*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act)
|
527
527
|
{
|
528
528
|
UnityTestResultsFailBegin(lineNumber);
|
529
529
|
UnityPrint(UnityStrElement);
|
530
530
|
UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
|
531
531
|
UnityPrint(UnityStrExpected);
|
532
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp, style);
|
532
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp, style);
|
533
533
|
UnityPrint(UnityStrWas);
|
534
|
-
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act, style);
|
534
|
+
UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act, style);
|
535
535
|
UnityAddMsgIfSpecified(msg);
|
536
536
|
UNITY_FAIL_AND_BAIL;
|
537
537
|
}
|
@@ -1101,12 +1101,19 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
|
|
1101
1101
|
}
|
1102
1102
|
|
1103
1103
|
//-----------------------------------------------
|
1104
|
-
#
|
1105
|
-
|
1106
|
-
|
1104
|
+
#if defined(UNITY_WEAK_ATTRIBUTE)
|
1105
|
+
void setUp(void);
|
1106
|
+
void tearDown(void);
|
1107
|
+
UNITY_WEAK_ATTRIBUTE void setUp(void) { }
|
1108
|
+
UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
|
1109
|
+
#elif defined(UNITY_WEAK_PRAGMA)
|
1110
|
+
# pragma weak setUp
|
1111
|
+
void setUp(void);
|
1112
|
+
# pragma weak tearDown
|
1113
|
+
void tearDown(void);
|
1107
1114
|
#else
|
1108
|
-
void setUp(void);
|
1109
|
-
void tearDown(void);
|
1115
|
+
void setUp(void);
|
1116
|
+
void tearDown(void);
|
1110
1117
|
#endif
|
1111
1118
|
//-----------------------------------------------
|
1112
1119
|
void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
|
@@ -292,22 +292,19 @@ extern int UNITY_OUTPUT_CHAR(int);
|
|
292
292
|
//-------------------------------------------------------
|
293
293
|
// Language Features Available
|
294
294
|
//-------------------------------------------------------
|
295
|
-
|
296
|
-
#ifdef __GNUC__
|
297
|
-
#
|
295
|
+
#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
|
296
|
+
# ifdef __GNUC__ // includes clang
|
297
|
+
# if !(defined(__WIN32__) && defined(__clang__))
|
298
|
+
# define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
|
299
|
+
# endif
|
300
|
+
# endif
|
298
301
|
#endif
|
299
302
|
|
300
|
-
#ifdef
|
301
|
-
#
|
303
|
+
#ifdef UNITY_NO_WEAK
|
304
|
+
# undef UNITY_WEAK_ATTRIBUTE
|
305
|
+
# undef UNITY_WEAK_PRAGMA
|
302
306
|
#endif
|
303
307
|
|
304
|
-
#ifndef UNITY_WEAK
|
305
|
-
#ifdef UNITY_SUPPORT_WEAK
|
306
|
-
#define UNITY_WEAK UNITY_SUPPORT_WEAK
|
307
|
-
#else
|
308
|
-
#define UNITY_WEAK
|
309
|
-
#endif
|
310
|
-
#endif
|
311
308
|
|
312
309
|
//-------------------------------------------------------
|
313
310
|
// Internal Structs Needed
|
@@ -10,6 +10,19 @@ compiler:
|
|
10
10
|
- '-Wno-address'
|
11
11
|
- '-std=c99'
|
12
12
|
- '-pedantic'
|
13
|
+
- '-Wextra'
|
14
|
+
- '-Werror'
|
15
|
+
- '-Wpointer-arith'
|
16
|
+
- '-Wcast-align'
|
17
|
+
- '-Wwrite-strings'
|
18
|
+
- '-Wswitch-default'
|
19
|
+
- '-Wunreachable-code'
|
20
|
+
- '-Winit-self'
|
21
|
+
- '-Wmissing-field-initializers'
|
22
|
+
- '-Wno-unknown-pragmas'
|
23
|
+
- '-Wstrict-prototypes'
|
24
|
+
- '-Wundef'
|
25
|
+
- '-Wold-style-definition'
|
13
26
|
includes:
|
14
27
|
prefix: '-I'
|
15
28
|
items:
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ceedling
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.18.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Karlesky, Mark VanderVoord
|
@@ -43,7 +43,7 @@ dependencies:
|
|
43
43
|
description: Ceedling provides a set of tools to deploy its guts in a folder or which
|
44
44
|
can be required in a Rakefile
|
45
45
|
email:
|
46
|
-
- michael@karlesky.net, mvandervoord@gmail.com, williams@
|
46
|
+
- michael@karlesky.net, mvandervoord@gmail.com, williams@atomicobject.com, fletcher@atomicobject.com
|
47
47
|
executables:
|
48
48
|
- ceedling
|
49
49
|
extensions: []
|
@@ -88,6 +88,7 @@ files:
|
|
88
88
|
- vendor/unity/auto/generate_test_runner.rb
|
89
89
|
- vendor/unity/auto/parseOutput.rb
|
90
90
|
- vendor/unity/auto/test_file_filter.rb
|
91
|
+
- vendor/unity/auto/type_sanitizer.rb
|
91
92
|
- vendor/unity/auto/unity_test_summary.rb
|
92
93
|
- vendor/unity/release/build.info
|
93
94
|
- vendor/unity/release/version.info
|
@@ -547,9 +548,6 @@ files:
|
|
547
548
|
- vendor/cmock/test/c/TestCMockCDynamic.c
|
548
549
|
- vendor/cmock/test/c/TestCMockCDynamic.yml
|
549
550
|
- vendor/cmock/test/c/TestCMockCDynamic_Runner.c
|
550
|
-
- vendor/cmock/test/spec/cmock_file_writer_spec.rb
|
551
|
-
- vendor/cmock/test/spec/cmock_generator_plugin_array_spec.rb
|
552
|
-
- vendor/cmock/test/spec/spec_helper.rb
|
553
551
|
- vendor/cmock/test/system/systest_generator.rb
|
554
552
|
- vendor/cmock/test/system/test_compilation/callingconv.h
|
555
553
|
- vendor/cmock/test/system/test_compilation/config.yml
|
@@ -753,6 +751,7 @@ files:
|
|
753
751
|
- vendor/hardmock/test/unit/trapper_test.rb
|
754
752
|
- vendor/hardmock/test/unit/verify_error_test.rb
|
755
753
|
- vendor/unity/auto/generate_config.yml
|
754
|
+
- vendor/unity/auto/unity_test_summary.py
|
756
755
|
- vendor/unity/docs/license.txt
|
757
756
|
- vendor/unity/docs/Unity Summary.odt
|
758
757
|
- vendor/unity/docs/Unity Summary.txt
|
@@ -1,45 +0,0 @@
|
|
1
|
-
here = File.expand_path(File.dirname(__FILE__))
|
2
|
-
require "#{here}/spec_helper" #add this to execute tests from the spec directory
|
3
|
-
require 'cmock_file_writer'
|
4
|
-
|
5
|
-
describe CMockFileWriter do
|
6
|
-
before do
|
7
|
-
@cmConfig = Object.new
|
8
|
-
|
9
|
-
#create instance of class under test
|
10
|
-
@subject = CMockFileWriter.new(@cmConfig)
|
11
|
-
end
|
12
|
-
|
13
|
-
describe 'initialize' do
|
14
|
-
it "have set up internal accessors correctly on init" do
|
15
|
-
result = @subject.config
|
16
|
-
result.should == @cmConfig
|
17
|
-
end
|
18
|
-
end
|
19
|
-
|
20
|
-
describe 'create_file' do
|
21
|
-
|
22
|
-
it "should complain if a block was not specified when calling create" do
|
23
|
-
expect {@subject.create_file("text.txt")}.should raise_error
|
24
|
-
# should.be_false
|
25
|
-
end
|
26
|
-
|
27
|
-
it "should perform block on new file" do
|
28
|
-
# mock(@cmConfig).enforce_strict_ordering {false}
|
29
|
-
mock(@cmConfig).mock_path {"testPath"}
|
30
|
-
mock(@cmConfig).mock_path {"testPath"}
|
31
|
-
|
32
|
-
FakeFile = Object.new
|
33
|
-
mock(File).open("testPath/test.txt.new", "w").yields(FakeFile, "test.txt")
|
34
|
-
mock(FakeFile).write("hello world"){nil}
|
35
|
-
|
36
|
-
mock(File).exist?("testPath/test.txt") {true}
|
37
|
-
mock(FileUtils).rm("testPath/test.txt")
|
38
|
-
mock(FileUtils).cp("testPath/test.txt.new", "testPath/test.txt")
|
39
|
-
mock(FileUtils).rm("testPath/test.txt.new")
|
40
|
-
# Call function under test
|
41
|
-
@subject.create_file("test.txt") {|f| f.write("hello world")}
|
42
|
-
end
|
43
|
-
|
44
|
-
end
|
45
|
-
end
|