tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show the ninja string that failed to parse in errors am: c5baf11a2d am: c03d43564a am: d7cd87ae92

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2393625

Change-Id: I0377eed81e23f654514c8ea7869ee96bd2bca557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2023-01-20 01:30:49 +00:00 committed by Automerger Merge Worker
commit 8048715429
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ninja_strings.go
View file

@ -118,7 +118,7 @@ func parseNinjaString(scope scope, str string) (ninjaString, error) {
r := rune(str[i])
state, err = state(parseState, i, r)
if err != nil {
return nil, err
return nil, fmt.Errorf("error parsing ninja string %q: %s", str, err)
}
}

6
ninja_strings_test.go
View file

@ -87,7 +87,7 @@ var ninjaParseTestCases = []struct {
strs: []string{"$ ", " "},
}, {
input: "foo $ bar",
err: "invalid character after '$' at byte offset 5",
err: `error parsing ninja string "foo $ bar": invalid character after '$' at byte offset 5`,
},
{
input: "foo $",
@ -95,11 +95,11 @@ var ninjaParseTestCases = []struct {
},
{
input: "foo ${} bar",
err: "empty variable name at byte offset 6",
err: `error parsing ninja string "foo ${} bar": empty variable name at byte offset 6`,
},
{
input: "foo ${abc!} bar",
err: "invalid character in variable name at byte offset 9",
err: `error parsing ninja string "foo ${abc!} bar": invalid character in variable name at byte offset 9`,
},
{
input: "foo ${abc",