From 4a1a7bdb4ded8e09a16a2ac248db6ce2dc79a8e3 Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Sun, 6 Dec 2009 19:20:53 +0000 Subject: [PATCH] - CMock verbosity control git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@150 bf332499-1b4d-0410-844d-d2d48d5cc64c --- lib/cmock.rb | 3 ++- lib/cmock_config.rb | 1 + lib/cmock_header_parser.rb | 3 ++- test/unit/cmock_header_parser_test.rb | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cmock.rb b/lib/cmock.rb index 98e4793..d48c54c 100644 --- a/lib/cmock.rb +++ b/lib/cmock.rb @@ -18,6 +18,7 @@ class CMock cm_gen_plugins = CMockPluginManager.new(cm_config, cm_gen_utils) @cm_parser = CMockHeaderParser.new(cm_config) @cm_generator = CMockGenerator.new(cm_config, cm_writer, cm_gen_utils, cm_gen_plugins) + @silent = (cm_config.verbosity < 2) end def setup_mocks(files) @@ -30,7 +31,7 @@ class CMock def generate_mock(src) name = File.basename(src, '.h') - puts "Creating mock for #{name}..." + puts "Creating mock for #{name}..." unless @silent @cm_generator.create_mock(name, @cm_parser.parse(File.read(src))) end end diff --git a/lib/cmock_config.rb b/lib/cmock_config.rb index f2de309..13337d5 100644 --- a/lib/cmock_config.rb +++ b/lib/cmock_config.rb @@ -16,6 +16,7 @@ class CMockConfig :memcmp_if_unknown => true, :when_no_prototypes => :warn, #the options being :ignore, :warn, or :error :when_ptr =>:compare_data, #the options being :compare_ptr, :compare_data, or :smart + :verbosity => 2, #0 errors only, #1 warnings and errors, #2 normal info, #3 verbose } def initialize(options=nil) diff --git a/lib/cmock_header_parser.rb b/lib/cmock_header_parser.rb index ca0fe2b..b2dada2 100644 --- a/lib/cmock_header_parser.rb +++ b/lib/cmock_header_parser.rb @@ -10,6 +10,7 @@ class CMockHeaderParser @standards = (['int','short','char','long','unsigned','signed'] + cfg.treat_as.keys).uniq @when_no_prototypes = cfg.when_no_prototypes @local_as_void = @treat_as_void + @verbosity = cfg.verbosity end def parse(source) @@ -94,7 +95,7 @@ class CMockHeaderParser when :error raise "ERROR: No function prototypes found!" when :warn - puts "WARNING: No function prototypes found!" + puts "WARNING: No function prototypes found!" unless (@verbosity < 1) end end return funcs diff --git a/test/unit/cmock_header_parser_test.rb b/test/unit/cmock_header_parser_test.rb index 1e62ff9..d676fd2 100644 --- a/test/unit/cmock_header_parser_test.rb +++ b/test/unit/cmock_header_parser_test.rb @@ -10,6 +10,7 @@ class CMockHeaderParserTest < Test::Unit::TestCase @config.expect.treat_as_void.returns(['MY_FUNKY_VOID']) @config.expect.treat_as.returns({ "BANJOS" => "INT", "TUBAS" => "HEX16"} ) @config.expect.when_no_prototypes.returns(:error) + @config.expect.verbosity.returns(1) @parser = CMockHeaderParser.new(@config) end