diff options
| author | Cole Faust <colefaust@google.com> | 2022-11-08 20:11:51 -0800 |
|---|---|---|
| committer | lberki <lberki@users.noreply.github.com> | 2022-11-09 13:29:42 +0100 |
| commit | 35adf62f83c590588db6b9a929c60c3c67ffd3b8 (patch) | |
| tree | 6c8388c7d41fa1e273d99a5982e5270705fa1962 | |
| parent | 09dfa26c4e59b15919aaad6986f9b47c883dc4f1 (diff) | |
| download | kati-35adf62f83c590588db6b9a929c60c3c67ffd3b8.tar.gz | |
Fix CI
| -rw-r--r-- | src/strutil.cc | 3 | ||||
| -rw-r--r-- | testcase/stem_middle.mk | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/strutil.cc b/src/strutil.cc index 8c4bdc0..4546265 100644 --- a/src/strutil.cc +++ b/src/strutil.cc @@ -160,8 +160,7 @@ bool Pattern::MatchImpl(StringPiece str) const { StringPiece Pattern::Stem(StringPiece str) const { if (!Match(str)) return ""; - return str.substr(percent_index_, - str.size() - pat_.size() + 1); + return str.substr(percent_index_, str.size() - pat_.size() + 1); } void Pattern::AppendSubst(StringPiece str, diff --git a/testcase/stem_middle.mk b/testcase/stem_middle.mk index cce73ae..6127c24 100644 --- a/testcase/stem_middle.mk +++ b/testcase/stem_middle.mk @@ -1,11 +1,16 @@ test: a/a.a b.b c/c +# ninja always makes the folders leading up to the outputs, +# so add mkdirs to match that functionality in make + a/%.a: + @mkdir -p a @echo $* %.b: @echo $* c/%: + @mkdir -p c @echo $* |