commit f1cbd0efdc4e8ab0a64b07c66696940e20d5981e
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Sun Dec 11 12:58:14 2022 UTC

fix spurious gotd regress failures caused by fixing gotsh echo_error()

commit - 911f5cd53ebab634350347c2294f801566a7149a
commit + f1cbd0efdc4e8ab0a64b07c66696940e20d5981e
blob - b1f71b3d833259a85937508a71f30bc99848279a
blob + 6a05d1fdb99b35b3bd0a2d6a625de556f636112b
--- regress/gotd/repo_read.sh
+++ regress/gotd/repo_read.sh
@@ -97,13 +97,14 @@ test_send_to_read_only_repo() {
 	echo "more alpha" >> $testroot/wt/alpha
 	(cd $testroot/wt && got commit -m 'make changes' > /dev/null)
 
-	got send -q -r $testroot/repo-clone 2>$testroot/stderr
+	got send -q -r $testroot/repo-clone 2>$testroot/stderr.raw
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got send succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
 	fi
+	grep -v ^gotsh: $testroot/stderr.raw > $testroot/stderr
 
 	echo 'got-send-pack: test-repo: Permission denied' \
 		> $testroot/stderr.expected
blob - c8b4fc889c65a723539f0957fff96fda7cd7d32b
blob + 02ac9f5c39831d35acbe6f1e5085754a83f77366
--- regress/gotd/repo_read_access_denied.sh
+++ regress/gotd/repo_read_access_denied.sh
@@ -23,13 +23,14 @@ test_clone_basic_access_denied() {
 	cp -r ${GOTD_TEST_REPO} $testroot/repo-copy
 
 	got clone -q ${GOTD_TEST_REPO_URL} $testroot/repo-clone \
-		2> $testroot/stderr
+		2> $testroot/stderr.raw
 	ret=$?
 	if [ $ret -eq 0 ]; then
 		echo "got clone succeeded unexpectedly" >&2
 		test_done "$testroot" "1"
 		return 1
 	fi
+	grep -v ^gotsh: $testroot/stderr.raw > $testroot/stderr
 
 	# Verify that the clone operation failed.
 	echo 'got-fetch-pack: test-repo: Permission denied' \