From e014cf0e545ca16abfd2a80d541750c6a3809082 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Fri, 24 Feb 2012 13:17:26 +1100
Subject: [PATCH] test: add cmpout to testlib

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5699060
---
 test/deferprint.go       | 2 +-
 test/fixedbugs/bug328.go | 2 +-
 test/fixedbugs/bug409.go | 2 +-
 test/goprint.go          | 2 +-
 test/helloworld.go       | 2 +-
 test/ken/cplx0.go        | 2 +-
 test/ken/string.go       | 2 +-
 test/printbig.go         | 2 +-
 test/run.go              | 3 +++
 test/testlib             | 4 ++++
 10 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/test/deferprint.go b/test/deferprint.go
index eab7ed46559..72c98b19fc9 100644
--- a/test/deferprint.go
+++ b/test/deferprint.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug328.go b/test/fixedbugs/bug328.go
index 825298371f9..73ab46d4591 100644
--- a/test/fixedbugs/bug328.go
+++ b/test/fixedbugs/bug328.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug409.go b/test/fixedbugs/bug409.go
index 884d3337087..1dca43b7ae4 100644
--- a/test/fixedbugs/bug409.go
+++ b/test/fixedbugs/bug409.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/goprint.go b/test/goprint.go
index 3fe08f30779..2f0d3c3904d 100644
--- a/test/goprint.go
+++ b/test/goprint.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/helloworld.go b/test/helloworld.go
index 9c33cab3bea..5025ec9bb35 100644
--- a/test/helloworld.go
+++ b/test/helloworld.go
@@ -1,4 +1,4 @@
-// $G $F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/ken/cplx0.go b/test/ken/cplx0.go
index f38ce5b65d1..912b8c489b3 100644
--- a/test/ken/cplx0.go
+++ b/test/ken/cplx0.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/ken/string.go b/test/ken/string.go
index e0510824293..9bd905d3d92 100644
--- a/test/ken/string.go
+++ b/test/ken/string.go
@@ -1,4 +1,4 @@
-// $G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/printbig.go b/test/printbig.go
index 6985796f3ab..5693c58d4f6 100644
--- a/test/printbig.go
+++ b/test/printbig.go
@@ -1,4 +1,4 @@
-// $G $F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+// cmpout
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/run.go b/test/run.go
index 4d4488a457d..3ba35f9d427 100644
--- a/test/run.go
+++ b/test/run.go
@@ -238,6 +238,9 @@ func (t *test) run() {
 	action = strings.TrimSpace(action)
 
 	switch action {
+	case "cmpout":
+		action = "run" // the run case already looks for <dir>/<test>.out files
+		fallthrough
 	case "compile", "build", "run", "errorcheck":
 		t.action = action
 	default:
diff --git a/test/testlib b/test/testlib
index ea8c5d74e09..2e4fefc8cb3 100644
--- a/test/testlib
+++ b/test/testlib
@@ -17,6 +17,10 @@ run() {
 	$G $D/$F.go && $L $F.$A && ./$A.out "$@"
 }
 
+cmpout() {
+	$G $D/$F.go && $L $F.$A && ./$A.out 2>&1 | cmp - $D/$F.out
+}
+
 errorcheck() {
 	errchk $G -e $D/$F.go
 }