mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-06-05 21:15:20 +00:00
Add to verbosity of failures to find prototypes in headers.
This commit is contained in:
@@ -39,7 +39,7 @@ class CMockHeaderParser
|
||||
|
||||
function_names = []
|
||||
|
||||
all_funcs = parse_functions(import_source(source, parse_project)).map { |item| [item] }
|
||||
all_funcs = parse_functions(name, import_source(source, parse_project)).map { |item| [item] }
|
||||
all_funcs += parse_cpp_functions(import_source(source, parse_project, true))
|
||||
all_funcs.map do |decl|
|
||||
func = parse_declaration(parse_project, *decl)
|
||||
@@ -358,15 +358,15 @@ class CMockHeaderParser
|
||||
funcs
|
||||
end
|
||||
|
||||
def parse_functions(source)
|
||||
def parse_functions(filename, source)
|
||||
funcs = []
|
||||
source.each { |line| funcs << line.strip.gsub(/\s+/, ' ') if line =~ @declaration_parse_matcher }
|
||||
if funcs.empty?
|
||||
case @when_no_prototypes
|
||||
when :error
|
||||
raise 'ERROR: No function prototypes found!'
|
||||
raise 'ERROR: No function prototypes found by CMock in #{filename}'
|
||||
when :warn
|
||||
puts 'WARNING: No function prototypes found!' unless @verbosity < 1
|
||||
puts 'WARNING: No function prototypes found by CMock in #{filename}' unless @verbosity < 1
|
||||
end
|
||||
end
|
||||
funcs
|
||||
|
||||
@@ -383,7 +383,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
|
||||
begin
|
||||
@parser.parse("module", source)
|
||||
rescue RuntimeError => e
|
||||
assert_equal("ERROR: No function prototypes found!", e.message)
|
||||
assert_match("ERROR: No function prototypes found", e.message)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -407,7 +407,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
|
||||
begin
|
||||
@parser.parse("module", source)
|
||||
rescue RuntimeError => e
|
||||
assert_equal("ERROR: No function prototypes found!", e.message)
|
||||
assert_match("ERROR: No function prototypes found", e.message)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -435,7 +435,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
|
||||
begin
|
||||
@parser.parse("module", source)
|
||||
rescue RuntimeError => e
|
||||
assert_equal("ERROR: No function prototypes found!", e.message)
|
||||
assert_match("ERROR: No function prototypes found", e.message)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -676,7 +676,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
|
||||
begin
|
||||
@parser.parse("module", source)
|
||||
rescue RuntimeError => e
|
||||
assert_equal("ERROR: No function prototypes found!", e.message)
|
||||
assert_match("ERROR: No function prototypes found", e.message)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -705,7 +705,7 @@ describe CMockHeaderParser, "Verify CMockHeaderParser Module" do
|
||||
begin
|
||||
@parser.parse("module", source)
|
||||
rescue RuntimeError => e
|
||||
assert_equal("ERROR: No function prototypes found!", e.message)
|
||||
assert_match("ERROR: No function prototypes found", e.message)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user