ceedling 0.17.0 → 0.18.0

data/vendor/unity/extras/fixture/src/unity_fixture.h

@@ -13,19 +13,22 @@
 #include "unity_fixture_malloc_overrides.h"
 #include "unity_fixture_internals.h"
 
-int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
+int UnityMain(int argc, const char* argv[], void (*runAllTests)(void));
 
 
 #define TEST_GROUP(group)\
     static const char* TEST_GROUP_##group = #group
 
-#define TEST_SETUP(group) void TEST_##group##_SETUP(void)
+#define TEST_SETUP(group) void TEST_##group##_SETUP(void);\
+    void TEST_##group##_SETUP(void)
 
-#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void)
+#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void);\
+    void TEST_##group##_TEAR_DOWN(void)
 
 
 #define TEST(group, name) \
     void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void);\
     void TEST_##group##_##name##_run(void)\
     {\
         UnityTestRunner(TEST_##group##_SETUP,\
@@ -39,6 +42,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
 
 #define IGNORE_TEST(group, name) \
     void TEST_##group##_##name##_(void);\
+    void TEST_##group##_##name##_run(void);\
     void TEST_##group##_##name##_run(void)\
     {\
         UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
@@ -60,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
     {\
         TEST_##group##_GROUP_RUNNER_runAll();\
     }\
-    void TEST_##group##_GROUP_RUNNER_runAll()
+    void TEST_##group##_GROUP_RUNNER_runAll(void)
 
 //Call this from main
 #define RUN_TEST_GROUP(group)\

data/vendor/unity/extras/fixture/src/unity_fixture_internals.h

@@ -29,7 +29,7 @@ void UnityIgnoreTest(const char * printableName);
 void UnityMalloc_StartTest(void);
 void UnityMalloc_EndTest(void);
 int UnityFailureCount(void);
-int UnityGetCommandLineOptions(int argc, char* argv[]);
+int UnityGetCommandLineOptions(int argc, const char* argv[]);
 void UnityConcludeFixtureTest(void);
 
 void UnityPointer_Set(void ** ptr, void * newValue);

data/vendor/unity/extras/fixture/src/unity_fixture_malloc_overrides.h

@@ -13,4 +13,9 @@
 #define realloc unity_realloc
 #define free    unity_free
 
+void* unity_malloc(size_t size);
+void* unity_calloc(size_t num, size_t size);
+void* unity_realloc(void * oldMem, size_t size);
+void unity_free(void * mem);
+
 #endif /* UNITY_FIXTURE_MALLOC_OVERRIDES_H_ */

data/vendor/unity/extras/fixture/test/main/AllTests.c

@@ -7,14 +7,14 @@
 
 #include "unity_fixture.h"
 
-static void runAllTests()
+static void runAllTests(void)
 {
     RUN_TEST_GROUP(UnityFixture);
     RUN_TEST_GROUP(UnityCommandOptions);
     RUN_TEST_GROUP(LeakDetection)
 }
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
     return UnityMain(argc, argv, runAllTests);
 }

data/vendor/unity/extras/fixture/test/unity_fixture_Test.c

@@ -158,7 +158,7 @@ TEST_TEAR_DOWN(UnityCommandOptions)
 }
 
 
-static char* noOptions[] = {
+static const char* noOptions[] = {
         "testrunner.exe"
 };
 
@@ -171,7 +171,7 @@ TEST(UnityCommandOptions, DefaultOptions)
     TEST_ASSERT_EQUAL(1, UnityFixture.RepeatCount);
 }
 
-static char* verbose[] = {
+static const char* verbose[] = {
         "testrunner.exe",
         "-v"
 };
@@ -182,7 +182,7 @@ TEST(UnityCommandOptions, OptionVerbose)
     TEST_ASSERT_EQUAL(1, UnityFixture.Verbose);
 }
 
-static char* group[] = {
+static const char* group[] = {
         "testrunner.exe",
         "-g", "groupname"
 };
@@ -193,7 +193,7 @@ TEST(UnityCommandOptions, OptionSelectTestByGroup)
     STRCMP_EQUAL("groupname", UnityFixture.GroupFilter);
 }
 
-static char* name[] = {
+static const char* name[] = {
         "testrunner.exe",
         "-n", "testname"
 };
@@ -204,7 +204,7 @@ TEST(UnityCommandOptions, OptionSelectTestByName)
     STRCMP_EQUAL("testname", UnityFixture.NameFilter);
 }
 
-static char* repeat[] = {
+static const char* repeat[] = {
         "testrunner.exe",
         "-r", "99"
 };
@@ -221,7 +221,7 @@ TEST(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount)
     TEST_ASSERT_EQUAL(99, UnityFixture.RepeatCount);
 }
 
-static char* multiple[] = {
+static const char* multiple[] = {
         "testrunner.exe",
         "-v",
         "-g", "groupname",
@@ -238,7 +238,7 @@ TEST(UnityCommandOptions, MultipleOptions)
     TEST_ASSERT_EQUAL(98, UnityFixture.RepeatCount);
 }
 
-static char* dashRNotLast[] = {
+static const char* dashRNotLast[] = {
         "testrunner.exe",
         "-v",
         "-g", "gggg",
@@ -255,7 +255,7 @@ TEST(UnityCommandOptions, MultipleOptionsDashRNotLastAndNoValueSpecified)
     TEST_ASSERT_EQUAL(2, UnityFixture.RepeatCount);
 }
 
-static char* unknownCommand[] = {
+static const char* unknownCommand[] = {
         "testrunner.exe",
         "-v",
         "-g", "groupname",

data/vendor/unity/extras/fixture/test/unity_output_Spy.c

@@ -25,7 +25,7 @@ void UnityOutputCharSpy_Create(int s)
     memset(buffer, 0, size);
 }
 
-void UnityOutputCharSpy_Destroy()
+void UnityOutputCharSpy_Destroy(void)
 {
     size = 0;
     free(buffer);
@@ -45,7 +45,7 @@ int UnityOutputCharSpy_OutputChar(int c)
     return c;
 }
 
-const char * UnityOutputCharSpy_Get()
+const char * UnityOutputCharSpy_Get(void)
 {
     return buffer;
 }

data/vendor/unity/extras/fixture/test/unity_output_Spy.h

@@ -9,9 +9,9 @@
 #define D_unity_output_Spy_H
 
 void UnityOutputCharSpy_Create(int s);
-void UnityOutputCharSpy_Destroy();
+void UnityOutputCharSpy_Destroy(void);
 int  UnityOutputCharSpy_OutputChar(int c);
-const char * UnityOutputCharSpy_Get();
+const char * UnityOutputCharSpy_Get(void);
 void UnityOutputCharSpy_Enable(int enable);
 
 #endif

data/vendor/unity/release/version.info

@@ -1,2 +1,2 @@
-2.1.0
+2.2.0
 

data/vendor/unity/src/unity.c

@@ -271,7 +271,7 @@ void UnityPrintOk(void)
 }
 
 //-----------------------------------------------
-void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
+static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
 {
     UnityPrint(file);
     UNITY_OUTPUT_CHAR(':');
@@ -282,7 +282,7 @@ void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
 }
 
 //-----------------------------------------------
-void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
+static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
 {
     UnityTestResultsBegin(Unity.TestFile, line);
     UnityPrint(UnityStrFail);
@@ -312,7 +312,7 @@ void UnityConcludeTest(void)
 }
 
 //-----------------------------------------------
-void UnityAddMsgIfSpecified(const char* msg)
+static void UnityAddMsgIfSpecified(const char* msg)
 {
     if (msg)
     {
@@ -322,7 +322,7 @@ void UnityAddMsgIfSpecified(const char* msg)
 }
 
 //-----------------------------------------------
-void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
+static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
 {
     UnityPrint(UnityStrExpected);
     if (expected != NULL)
@@ -352,7 +352,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual
 // Assertion & Control Helpers
 //-----------------------------------------------
 
-int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg)
+static int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg)
 {
     //return true if they are both NULL
     if ((expected == NULL) && (actual == NULL))
@@ -481,15 +481,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         case UNITY_DISPLAY_STYLE_UINT16:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US16*)(void*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -503,15 +503,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         case UNITY_DISPLAY_STYLE_UINT64:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US64*)(void*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -523,15 +523,15 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected,
         default:
             while (elements--)
             {
-                if (*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act)
+                if (*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp != *(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act)
                 {
                     UnityTestResultsFailBegin(lineNumber);
                     UnityPrint(UnityStrElement);
                     UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT);
                     UnityPrint(UnityStrExpected);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_exp, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_exp, style);
                     UnityPrint(UnityStrWas);
-                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)ptr_act, style);
+                    UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE const _US32*)(void*)ptr_act, style);
                     UnityAddMsgIfSpecified(msg);
                     UNITY_FAIL_AND_BAIL;
                 }
@@ -1101,12 +1101,19 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
 }
 
 //-----------------------------------------------
-#ifdef UNITY_SUPPORT_WEAK
-UNITY_WEAK void setUp(void) { }
-UNITY_WEAK void tearDown(void) { }
+#if defined(UNITY_WEAK_ATTRIBUTE)
+    void setUp(void);
+    void tearDown(void);
+    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
+    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
+#elif defined(UNITY_WEAK_PRAGMA)
+#   pragma weak setUp
+    void setUp(void);
+#   pragma weak tearDown
+    void tearDown(void);
 #else
-void setUp(void);
-void tearDown(void);
+    void setUp(void);
+    void tearDown(void);
 #endif
 //-----------------------------------------------
 void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)

data/vendor/unity/src/unity_internals.h

@@ -292,22 +292,19 @@ extern int UNITY_OUTPUT_CHAR(int);
 //-------------------------------------------------------
 // Language Features Available
 //-------------------------------------------------------
-
-#ifdef __GNUC__
-#define UNITY_SUPPORT_WEAK __attribute__((weak))
+#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
+#   ifdef __GNUC__ // includes clang
+#       if !(defined(__WIN32__) && defined(__clang__))
+#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
+#       endif
+#   endif
 #endif
 
-#ifdef __clang__
-#define UNITY_SUPPORT_WEAK __attribute__((weak))
+#ifdef UNITY_NO_WEAK
+#   undef UNITY_WEAK_ATTRIBUTE
+#   undef UNITY_WEAK_PRAGMA
 #endif
 
-#ifndef UNITY_WEAK
-#ifdef UNITY_SUPPORT_WEAK
-#define UNITY_WEAK UNITY_SUPPORT_WEAK
-#else
-#define UNITY_WEAK
-#endif
-#endif
 
 //-------------------------------------------------------
 // Internal Structs Needed

data/vendor/unity/test/targets/gcc_auto_stdint.yml

@@ -10,6 +10,19 @@ compiler:
     - '-Wno-address'
     - '-std=c99'
     - '-pedantic'
+    - '-Wextra'
+    - '-Werror'
+    - '-Wpointer-arith'
+    - '-Wcast-align'
+    - '-Wwrite-strings'
+    - '-Wswitch-default'
+    - '-Wunreachable-code'
+    - '-Winit-self'
+    - '-Wmissing-field-initializers'
+    - '-Wno-unknown-pragmas'
+    - '-Wstrict-prototypes'
+    - '-Wundef'
+    - '-Wold-style-definition'
   includes:
     prefix: '-I'
     items:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ceedling
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Mike Karlesky, Mark VanderVoord
@@ -43,7 +43,7 @@ dependencies:
 description: Ceedling provides a set of tools to deploy its guts in a folder or which
   can be required in a Rakefile
 email:
-- michael@karlesky.net, mvandervoord@gmail.com, williams@atomicembedded.com, fletcher@atomicobject.com
+- michael@karlesky.net, mvandervoord@gmail.com, williams@atomicobject.com, fletcher@atomicobject.com
 executables:
 - ceedling
 extensions: []
@@ -88,6 +88,7 @@ files:
 - vendor/unity/auto/generate_test_runner.rb
 - vendor/unity/auto/parseOutput.rb
 - vendor/unity/auto/test_file_filter.rb
+- vendor/unity/auto/type_sanitizer.rb
 - vendor/unity/auto/unity_test_summary.rb
 - vendor/unity/release/build.info
 - vendor/unity/release/version.info
@@ -547,9 +548,6 @@ files:
 - vendor/cmock/test/c/TestCMockCDynamic.c
 - vendor/cmock/test/c/TestCMockCDynamic.yml
 - vendor/cmock/test/c/TestCMockCDynamic_Runner.c
-- vendor/cmock/test/spec/cmock_file_writer_spec.rb
-- vendor/cmock/test/spec/cmock_generator_plugin_array_spec.rb
-- vendor/cmock/test/spec/spec_helper.rb
 - vendor/cmock/test/system/systest_generator.rb
 - vendor/cmock/test/system/test_compilation/callingconv.h
 - vendor/cmock/test/system/test_compilation/config.yml
@@ -753,6 +751,7 @@ files:
 - vendor/hardmock/test/unit/trapper_test.rb
 - vendor/hardmock/test/unit/verify_error_test.rb
 - vendor/unity/auto/generate_config.yml
+- vendor/unity/auto/unity_test_summary.py
 - vendor/unity/docs/license.txt
 - vendor/unity/docs/Unity Summary.odt
 - vendor/unity/docs/Unity Summary.txt

data/vendor/cmock/test/spec/cmock_file_writer_spec.rb

@@ -1,45 +0,0 @@
-here = File.expand_path(File.dirname(__FILE__))
-require "#{here}/spec_helper" #add this to execute tests from the spec directory
-require 'cmock_file_writer'
-
-describe CMockFileWriter do 
-	before do
-		@cmConfig = Object.new
-
-		#create instance of class under test
-		@subject = CMockFileWriter.new(@cmConfig)
-	end
-
-	describe 'initialize' do 
-		it "have set up internal accessors correctly on init" do 
-			result = @subject.config
-			result.should == @cmConfig
-		end
-	end
-
-	describe 'create_file' do
-
-		it "should complain if a block was not specified when calling create" do 
-			expect {@subject.create_file("text.txt")}.should raise_error
-			# should.be_false
-		end
-
-		it "should perform block on new file" do
-					# mock(@cmConfig).enforce_strict_ordering {false}
-			mock(@cmConfig).mock_path {"testPath"}
-			mock(@cmConfig).mock_path {"testPath"}
-
-			FakeFile = Object.new
-			mock(File).open("testPath/test.txt.new", "w").yields(FakeFile, "test.txt")
-			mock(FakeFile).write("hello world"){nil}
-
-			mock(File).exist?("testPath/test.txt") {true}
-			mock(FileUtils).rm("testPath/test.txt")
-			mock(FileUtils).cp("testPath/test.txt.new", "testPath/test.txt")
-			mock(FileUtils).rm("testPath/test.txt.new")
-			# Call function under test
-			@subject.create_file("test.txt") {|f| f.write("hello world")}
-		end
-
-	end
-end