espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-15 00:52:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

- If we declare main before the definition, we make sure the arguments match

Browse Source
This commit is contained in:
Mark VanderVoord
2016-07-08 16:05:32 -04:00
parent eba387fa3e
commit f205b7de05
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
auto/generate_test_runner.rb
View File

@ -299,10 +299,10 @@ class UnityTestRunnerGenerator
def create_main(output, filename, tests, used_mocks) def create_main(output, filename, tests, used_mocks)
output.puts("\n\n/*=======MAIN=====*/") output.puts("\n\n/*=======MAIN=====*/")
main_name = (@options[:main_name].to_sym == :auto) ? "main_#{filename.gsub('.c','')}" : "#{@options[:main_name]}" main_name = (@options[:main_name].to_sym == :auto) ? "main_#{filename.gsub('.c','')}" : "#{@options[:main_name]}"
if (main_name != "main")
output.puts("#{@options[:main_export_decl]} int #{main_name}(void);")
end
if (@options[:cmdline_args]) if (@options[:cmdline_args])
if (main_name != "main")
output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv);")
end
output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)") output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
output.puts("{") output.puts("{")
output.puts(" int parse_status = UnityParseOptions(argc, argv);") output.puts(" int parse_status = UnityParseOptions(argc, argv);")
@ -332,6 +332,9 @@ class UnityTestRunnerGenerator
output.puts(" return parse_status;") output.puts(" return parse_status;")
output.puts(" }") output.puts(" }")
else else
if (main_name != "main")
output.puts("#{@options[:main_export_decl]} int #{main_name}(void);")
end
output.puts("int #{main_name}(void)") output.puts("int #{main_name}(void)")
output.puts("{") output.puts("{")
end end