test: remove rundircmpout and cmpout actions

Yury Smolsky · bradfitz · commit 57d40f1b27c0 · 2018-05-31T17:36:45.000Z
This CL removes the rundircmpout action completely because it is not used anywhere. The run case already looks for output files. Rename the cmpout action mentioned in tests to the run action and remove "cmpout" from run.go. Change-Id: I835ceb70082927f8e9360e0ea0ba74f296363ab3 Reviewed-on: https://go-review.googlesource.com/115575 Run-TryBot: Yury Smolsky <yury@smolsky.by> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/misc/cgo/life/main.go b/misc/cgo/life/main.go
@@ -1,4 +1,4 @@
-// cmpout -tags=use_go_run
+// run -tags=use_go_run
 
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/misc/cgo/stdio/chain.go b/misc/cgo/stdio/chain.go
@@ -1,4 +1,4 @@
-// cmpout -tags=use_go_run
+// run -tags=use_go_run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/misc/cgo/stdio/fib.go b/misc/cgo/stdio/fib.go
@@ -1,4 +1,4 @@
-// cmpout -tags=use_go_run
+// run -tags=use_go_run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/misc/cgo/stdio/hello.go b/misc/cgo/stdio/hello.go
@@ -1,4 +1,4 @@
-// cmpout -tags=use_go_run
+// run -tags=use_go_run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/deferprint.go b/test/deferprint.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/bug206.go b/test/fixedbugs/bug206.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2009 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/issue21887.go b/test/fixedbugs/issue21887.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/issue22683.go b/test/fixedbugs/issue22683.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/issue25322.go b/test/fixedbugs/issue25322.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2018 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/fixedbugs/issue6899.go b/test/fixedbugs/issue6899.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2013 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/print.go b/test/print.go
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // Copyright 2014 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
@@ -1,4 +1,4 @@
-// cmpout
+// run
 
 // 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
@@ -502,10 +502,6 @@ func (t *test) run() {
 
 	// TODO: Clean up/simplify this switch statement.
 	switch action {
-	case "rundircmpout":
-		action = "rundir"
-	case "cmpout":
-		action = "run" // the run case already looks for <dir>/<test>.out files
 	case "compile", "compiledir", "build", "builddir", "buildrundir", "run", "buildrun", "runoutput", "rundir", "asmcheck":
 		// nothing to do
 	case "errorcheckandrundir":
diff --git a/test/sigchld.go b/test/sigchld.go
@@ -1,5 +1,5 @@
 // +build !plan9,!windows
-// cmpout
+// run
 
 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// cmpout -tags=use_go_run`
	`1`	`+// run -tags=use_go_run`
`2`	`2`
`3`	`3`	`// Copyright 2010 The Go Authors. All rights reserved.`
`4`	`4`	`// Use of this source code is governed by a BSD-style`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// cmpout`
	`1`	`+// run`
`2`	`2`
`3`	`3`	`// Copyright 2010 The Go Authors. All rights reserved.`
`4`	`4`	`// Use of this source code is governed by a BSD-style`