From 144252d2e64c9f375760f98d6a04d20601b6d3a0 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 18 Oct 2023 10:48:50 -0400 Subject: [PATCH] cmd/go: make pkg-config check less picky CL 529219 tweaked the list_pkgconfig_error script test currently to expect pkg-config to fail with "Package .* not found$", but on several OSes (at least OpenBSD, AIX, and Solaris), pkg-config prints "Package libnot-a-valid-cgo-library was not found in the pkg-config search path". Fix the test on these OSes by dropping the "$" so the test doesn't require the line to end with "not found". Change-Id: I40c577521f34c360a1d62355596958f6f969eb54 Reviewed-on: https://go-review.googlesource.com/c/go/+/536195 Reviewed-by: Cherry Mui Reviewed-by: Alan Donovan Auto-Submit: Austin Clements LUCI-TryBot-Result: Go LUCI --- src/cmd/go/testdata/script/list_pkgconfig_error.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/go/testdata/script/list_pkgconfig_error.txt b/src/cmd/go/testdata/script/list_pkgconfig_error.txt index 8e5a278dd0..de6eafd2c2 100644 --- a/src/cmd/go/testdata/script/list_pkgconfig_error.txt +++ b/src/cmd/go/testdata/script/list_pkgconfig_error.txt @@ -2,7 +2,7 @@ [!exec:pkg-config] skip 'test requires pkg-config tool' ! go list -export . -stderr '^go build example:\n# pkg-config (.*\n)+Package .* not found$' +stderr '^go build example:\n# pkg-config (.*\n)+Package .* not found' -- go.mod -- module example -- 2.50.0