From 4dbf79fbe5613ebe81831391ebb98e113a01b8ad Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Tue, 1 Jul 2025 11:19:17 +0100 Subject: [PATCH 1/3] Correctly format package filenames in log function output The ASP logging functions' output formats the package filenames that trigger them as if they were build target names, which is incorrect - format them like the filenames that they are instead. Fixes #3375. --- src/parse/asp/builtins.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parse/asp/builtins.go b/src/parse/asp/builtins.go index 69c2564c17..c34479f304 100644 --- a/src/parse/asp/builtins.go +++ b/src/parse/asp/builtins.go @@ -172,10 +172,10 @@ func setLogCode(s *scope, name string, f func(format string, args ...interface{} for i, arg := range args { l[i] = arg } - f("//%s: %s", s.pkgFilename(), fmt.Sprintf(string(str), l[1:]...)) + f("%s: %s", s.pkgFilename(), fmt.Sprintf(string(str), l[1:]...)) return None } - f("//%s: %s", s.pkgFilename(), args) + f("%s: %s", s.pkgFilename(), args) return None }).varargs = true } From 66393114bd862fa3a32e52670d1197410341f914 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Tue, 1 Jul 2025 11:31:04 +0100 Subject: [PATCH 2/3] Update tests --- src/parse/asp/logging_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/parse/asp/logging_test.go b/src/parse/asp/logging_test.go index 2c0ac604de..fb8ac0bf15 100644 --- a/src/parse/asp/logging_test.go +++ b/src/parse/asp/logging_test.go @@ -52,9 +52,9 @@ func TestLogNotice(t *testing.T) { _, err := parseFile2("src/parse/asp/test_data/interpreter/log.build") require.NoError(t, err) assertRecords(t, backend, []record{ - {logging.NOTICE, "//test/package/BUILD: notice"}, - {logging.WARNING, "//test/package/BUILD: warning"}, - {logging.ERROR, "//test/package/BUILD: error"}, + {logging.NOTICE, "test/package/BUILD: notice"}, + {logging.WARNING, "test/package/BUILD: warning"}, + {logging.ERROR, "test/package/BUILD: error"}, }) } @@ -64,9 +64,9 @@ func TestLogInfo(t *testing.T) { _, err := parseFile2("src/parse/asp/test_data/interpreter/log.build") require.NoError(t, err) assertRecords(t, backend, []record{ - {logging.INFO, "//test/package/BUILD: info"}, - {logging.NOTICE, "//test/package/BUILD: notice"}, - {logging.WARNING, "//test/package/BUILD: warning"}, - {logging.ERROR, "//test/package/BUILD: error"}, + {logging.INFO, "test/package/BUILD: info"}, + {logging.NOTICE, "test/package/BUILD: notice"}, + {logging.WARNING, "test/package/BUILD: warning"}, + {logging.ERROR, "test/package/BUILD: error"}, }) } From 764ac5763464a21d808e944d620242707563a835 Mon Sep 17 00:00:00 2001 From: Chris Novakovic Date: Tue, 1 Jul 2025 12:05:52 +0100 Subject: [PATCH 3/3] Update more tests --- src/parse/asp/interpreter_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parse/asp/interpreter_test.go b/src/parse/asp/interpreter_test.go index d94fce0f6c..177d500e61 100644 --- a/src/parse/asp/interpreter_test.go +++ b/src/parse/asp/interpreter_test.go @@ -689,7 +689,7 @@ func TestLogConfigVariable(t *testing.T) { setLogCode(s, "info", capture) s.interpretStatements(statements) - assert.Equal(t, `//: {"baz": 6, "foo": bar}`, capturedOutput) + assert.Equal(t, `: {"baz": 6, "foo": bar}`, capturedOutput) } func TestOperatorPrecedence(t *testing.T) {