ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-07-30 15:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #211 from merazmus/fix_missing_header

Browse Source 
Fix missing framework header in mock header files
This commit is contained in:
Mark VanderVoord
2019-03-22 05:41:23 -04:00
committed by GitHub
parent 2b93dfdd1d af59c531f7
commit e417f323fc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator.rb
+1 -1
View File
@@ -95,6 +95,7 @@ class CMockGenerator
file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
file << "#ifndef _#{define_name}_H\n"
file << "#define _#{define_name}_H\n\n"
file << "#include \"#{@framework}.h\"\n"
@includes_h_pre_orig_header.each {|inc| file << "#include #{inc}\n"}
file << @config.orig_header_include_fmt.gsub(/%s/, "#{orig_filename}") + "\n"
@includes_h_post_orig_header.each {|inc| file << "#include #{inc}\n"}
@@ -144,7 +145,6 @@ class CMockGenerator
file << "#include <string.h>\n"
file << "#include <stdlib.h>\n"
file << "#include <setjmp.h>\n"
file << "#include \"#{@framework}.h\"\n"
file << "#include \"cmock.h\"\n"
@includes_c_pre_header.each {|inc| file << "#include #{inc}\n"}
file << "#include \"#{header_file}\"\n"
test/unit/cmock_generator_main_test.rb
+4 -1
View File
@@ -92,6 +92,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
"#ifndef _#{define_name}\n",
"#define _#{define_name}\n\n",
"#include \"unity.h\"\n",
"#include \"ConfigRequiredHeader1.h\"\n",
"#include \"ConfigRequiredHeader2.h\"\n",
"#include \"#{orig_filename}\"\n",
@@ -147,6 +148,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
"#ifndef _#{define_name}\n",
"#define _#{define_name}\n\n",
"#include \"unity.h\"\n",
"#include \"ConfigRequiredHeader1.h\"\n",
"#include \"ConfigRequiredHeader2.h\"\n",
"#include \"#{orig_filename}\"\n",
@@ -185,6 +187,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
"#ifndef _#{define_name}\n",
"#define _#{define_name}\n\n",
"#include \"unity.h\"\n",
"#include \"ConfigRequiredHeader1.h\"\n",
"#include \"ConfigRequiredHeader2.h\"\n",
"#include \"#{orig_filename}\"\n",
@@ -222,6 +225,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
"#ifndef _#{define_name}\n",
"#define _#{define_name}\n\n",
"#include \"unity.h\"\n",
"#include \"ConfigRequiredHeader1.h\"\n",
"#include \"ConfigRequiredHeader2.h\"\n",
"#include \"#{orig_filename}\"\n",
@@ -308,7 +312,6 @@ describe CMockGenerator, "Verify CMockGenerator Module" do
"#include <string.h>\n",
"#include <stdlib.h>\n",
"#include <setjmp.h>\n",
"#include \"unity.h\"\n",
"#include \"cmock.h\"\n",
"#include \"MockPoutPoutFish.h\"\n",
"\n",