diff options
| author | Stefan Becker <stefanb@gpartner-nvidia.com> | 2016-04-08 15:45:16 +0300 |
|---|---|---|
| committer | Stefan Becker <stefanb@gpartner-nvidia.com> | 2016-04-12 12:31:46 +0300 |
| commit | 786881c217e1d4c3715e7d3dea6eb062677180e1 (patch) | |
| tree | 9d6b1e665589fa2dc4e306c9c7810ba4e14c56d5 /eval.cc | |
| parent | d4f287145feb677e99f0bf30fa6a0e14bd79f896 (diff) | |
[C++] Replace erroneous return in EvalInclude()
We need to continue the loop, not abort the function, otherwise kati
will ignore include files that should not be ignored.
Test case:
$ cat Makefile.minus-include-main
.PHONY: default
default:
-include Makefile.minus-include-?
$ cat Makefile.minus-include-a
$(info include a...)
$ cat Makefile.minus-include-b
$(info include b...)
$ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main
include b...
include a...
$ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-a
arguments changed, regenerating...
include b...
$ ckati --warn --gen_all_targets --regen --ninja -f Makefile.minus-include-main --ignore_optional_include=Makefile.minus-include-b
arguments changed, regenerating...
Fixes https://github.com/google/kati/issues/54
Change-Id: I139392510b02d48c224edf4a8e6e186d52f26699
Diffstat (limited to 'eval.cc')
| -rw-r--r-- | eval.cc | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -253,7 +253,7 @@ void Evaluator::EvalInclude(const IncludeStmt* stmt) { for (const string& fname : *files) { if (!stmt->should_exist && g_flags.ignore_optional_include_pattern && Pattern(g_flags.ignore_optional_include_pattern).Match(fname)) { - return; + continue; } DoInclude(fname); } |
