From 738515b0d0e6eeb0cc3d22d2f754609b3b44d47b Mon Sep 17 00:00:00 2001
From: qiulaidongfeng <2645477756@qq.com>
Date: Sat, 6 Jul 2024 19:03:24 +0800
Subject: [PATCH 1/3] cmd/go: relax the regular expression of
 TestScript/list_pkgconfig_error

FIxes #68283

Change-Id: I0b456463d9dd7206dd1ed3ed3b3d7a18762cd95d
---
 src/cmd/go/testdata/script/list_pkgconfig_error.txt | 4 +++-
 1 file changed, 3 insertions(+), 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 f554d2a4ed6258..b1e7f29ffaafde 100644
--- a/src/cmd/go/testdata/script/list_pkgconfig_error.txt
+++ b/src/cmd/go/testdata/script/list_pkgconfig_error.txt
@@ -2,7 +2,9 @@
 [!exec:pkg-config] skip 'test requires pkg-config tool'
 
 ! go list -export .
-stderr '^# example\n# \[pkg-config .*\]\n(.*\n)*Package .* not found'
+stderr 'pkg-config'
+stderr 'not found|not find'
+stderr 'package|Package'
 
 -- go.mod --
 module example

From f73a487d307cbc2d162f54b36b200360bc1ad46a Mon Sep 17 00:00:00 2001
From: qiulaidongfeng <2645477756@qq.com>
Date: Mon, 26 Aug 2024 20:29:41 +0800
Subject: [PATCH 2/3] new

Change-Id: I2ede8e7cad326c8456556cf5cf4be4d893856439
---
 src/cmd/go/testdata/script/list_pkgconfig_error.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cmd/go/testdata/script/list_pkgconfig_error.txt b/src/cmd/go/testdata/script/list_pkgconfig_error.txt
index b1e7f29ffaafde..6084eabb5cfa73 100644
--- a/src/cmd/go/testdata/script/list_pkgconfig_error.txt
+++ b/src/cmd/go/testdata/script/list_pkgconfig_error.txt
@@ -2,6 +2,7 @@
 [!exec:pkg-config] skip 'test requires pkg-config tool'
 
 ! go list -export .
+stderr '^# example\n# '
 stderr 'pkg-config'
 stderr 'not found|not find'
 stderr 'package|Package'

From 206ce8b0d9309e09c7b482d3e0f42a8f47474936 Mon Sep 17 00:00:00 2001
From: qiulaidongfeng <2645477756@qq.com>
Date: Wed, 18 Sep 2024 21:38:35 +0800
Subject: [PATCH 3/3] new

Change-Id: I8127ed76592bde33ef09aaf697fb69608982e3d5
---
 src/cmd/go/testdata/script/list_pkgconfig_error.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cmd/go/testdata/script/list_pkgconfig_error.txt b/src/cmd/go/testdata/script/list_pkgconfig_error.txt
index 6084eabb5cfa73..d40d45e39cbb4d 100644
--- a/src/cmd/go/testdata/script/list_pkgconfig_error.txt
+++ b/src/cmd/go/testdata/script/list_pkgconfig_error.txt
@@ -2,10 +2,9 @@
 [!exec:pkg-config] skip 'test requires pkg-config tool'
 
 ! go list -export .
-stderr '^# example\n# '
-stderr 'pkg-config'
-stderr 'not found|not find'
-stderr 'package|Package'
+# 'Package .* not found appears' in pkg-config and pkgconf; while
+# 'could not find package .*' appears in u-config. See #68283.
+stderr '#^ example\n#pkg-config .*\n(.*\n)*(Package .* not found)|(could not find package .*)'
 
 -- go.mod --
 module example