Fix patch with clean 3-way merge

microsoft · Mar 24, 2022 · 62cf5f4 · 62cf5f4
1 parent 2c81963
commit 62cf5f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/patches/0001-cmd-dist-add-JSON-output-support-for-some-tests.patch b/patches/0001-cmd-dist-add-JSON-output-support-for-some-tests.patch
@@ -17,7 +17,7 @@ in JSON format, and the ordinary logs are still important.
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
-index cd3c26ab3a..8ce6c3a0be 100644
+index a540a2abda..b21c99adb6 100644
 --- a/src/cmd/dist/test.go
 +++ b/src/cmd/dist/test.go
 @@ -29,6 +29,7 @@ func cmdtest() {
@@ -51,9 +51,9 @@ index cd3c26ab3a..8ce6c3a0be 100644
  }
 
  func (t *tester) tags() string {
-@@ -399,6 +405,9 @@ func (t *tester) registerStdTest(pkg string) {
- 				t.timeout(timeoutSec),
- 				"-gcflags=all=" + gcflags,
+@@ -401,6 +407,9 @@ func (t *tester) registerStdTest(pkg string) {
+ 			if gcflags != "" {
+ 				args = append(args, "-gcflags=all="+gcflags)
  			}
 +			if t.jsonMode {
 +				args = append(args, "-json")