Skip to content

Commit 77ec4d9

Browse files
authored
Merge pull request #1058 from bidds95/feature/support_dash_in_include
Add support for dashes in filenames to test context extractor
2 parents 9c57c28 + c5ac1b3 commit 77ec4d9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/ceedling/test_context_extractor.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def _extract_includes(line)
308308
includes = []
309309

310310
# Look for #include statements
311-
results = line.match(/#\s*include\s+\"\s*((\w|\.)+)\s*\"/)
311+
results = line.match(/#\s*include\s+\"\s*([\w\.\-]+)\s*\"/)
312312
includes << results[1] if !results.nil?
313313

314314
return includes

spec/test_context_extractor_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
#include "unity.h"
110110
111111
#include "mock_File.h"
112-
#include "mock_another_file.h"
113-
#include " mock_another_file.h " // Duplicate to be ignored
112+
#include "mock_another-file.h"
113+
#include " mock_another-file.h " // Duplicate to be ignored
114114
CONTENTS
115115

116116
input = StringIO.new( file_contents )
@@ -120,7 +120,7 @@
120120
'more_source.h',
121121
'unity.h',
122122
'mock_File.h',
123-
'mock_another_file.h'
123+
'mock_another-file.h'
124124
]
125125

126126
expect( @extractor.extract_includes( input ) ).to eq expected

0 commit comments

Comments
 (0)