From 2afb9d7722f5db3a2a35bd8f9703c5b2e91f5bd6 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Sun, 24 Oct 2021 15:16:59 -0700 Subject: [PATCH] Fix how the rule is displayed in the error message. Bug: 204001941 Test: internal Change-Id: I19c73356cc305ec7a6dfd3bddbde775ef9ca4953 --- mk2rbc/mk2rbc.go | 2 +- mk2rbc/mk2rbc_test.go | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mk2rbc/mk2rbc.go b/mk2rbc/mk2rbc.go index 99008d1c2..fb726384f 100644 --- a/mk2rbc/mk2rbc.go +++ b/mk2rbc/mk2rbc.go @@ -1466,7 +1466,7 @@ func (ctx *parseContext) handleSimpleStatement(node mkparser.Node) bool { handled = false } default: - ctx.errorf(x, "unsupported line %s", x.Dump()) + ctx.errorf(x, "unsupported line %s", strings.ReplaceAll(x.Dump(), "\n", "\n#")) } return handled } diff --git a/mk2rbc/mk2rbc_test.go b/mk2rbc/mk2rbc_test.go index b657e7619..d3ac7fc7f 100644 --- a/mk2rbc/mk2rbc_test.go +++ b/mk2rbc/mk2rbc_test.go @@ -961,6 +961,23 @@ def init(g, handle): if not _varmod_init: rblf.mkerror("cannot") rblf.inherit(handle, _varmod, _varmod_init) +`, + }, + { + desc: "Ignore make rules", + mkname: "product.mk", + in: ` +foo: foo.c + gcc -o $@ $*`, + expected: `# MK2RBC TRANSLATION ERROR: unsupported line rule: foo: foo.c +#gcc -o $@ $* +# rule: foo: foo.c +# gcc -o $@ $* +load("//build/make/core:product_config.rbc", "rblf") + +def init(g, handle): + cfg = rblf.cfg(handle) + rblf.warning("product.mk", "partially successful conversion") `, }, }