test: remove rundircmpout and cmpout actions

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
index 45376fd05a97fde57588e534105dd144e41c1ae3..145a273bdd1fd9d6e945f87e9f61caa74da6e8f8 100644 (file)
--- 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
index 0fa813cab7082631cead57fb392b29c701d00684..cdc385208c9898ee7111b2b1f21b7d0d4d20d3fa 100644 (file)
--- 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
index 56e32552ee6dea6500406b418b76733b21bb9eca..58f185c90f05105d521ab017ec866c1eb60cb78d 100644 (file)
--- 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
index 63bff4c617a1371a152c4cec51896ed318585011..56220d34be324cd602cf007a61f418c7cdfc0b74 100644 (file)
--- 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
index 3dc08542c1f76b20b2263e713c829c1be6e8862d..b74677ac59c9810743ce6ba667858bd4e835c440 100644 (file)
--- 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
index c2382acf13ff5119c7f03f55413785545c4043b7..91efa3ff79005ed51d83bbaf3c3ca3679cd05dfe 100644 (file)
--- 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
index 180af05fde5a9904afd596d25e48d7448f48b626..57043f30af72dc35d58eb81962fec29d41415ad7 100644 (file)
--- 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
index 9e08a8e67633c53cf8df124d2716c5e87a411f58..e8546361ab49343d34083131cb0aed0327bee134 100644 (file)
--- 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
index 9e3e91fcdb78238cf98e4e97f12ec0938b0447ec..73c3f43596ff406d3ad4c6230231a30c59a19405 100644 (file)
--- 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
index a59a0edaf4f5c817ef2769094a641f2594199e9b..47c7f6513d9f3f1d6fd3367a62d086df439c80d9 100644 (file)
--- 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
index 7489bbdfc2219307d331d8737463fbfbc2ae3851..ee4ff53e2eedfdb5036785195d6a549a0139f91a 100644 (file)
--- 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
index f98f551b321a6d28e24350c594b5f92d3a57d592..d7f8578029884d5e388d64427f49a02f9125602d 100644 (file)
--- 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
index 0648c77e7d8570372f9644fac6e15b0446d2d92b..57eeac53a803669c6b671e0c264f3a49e6b4969f 100644 (file)
--- 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
index 5025ec9bb350b85220d867180f931cbe04080f74..06851d13b3aa7b66c0438bdd2c5ea00ad4f4d1c1 100644 (file)
--- 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
index 665e52a5f3580dd0e558b44ff069ee7b0803350e..5d78dc0147a1ece7f998abd1b8eaf789bf6b2512 100644 (file)
--- 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
index 6df8dc4ddf1939c6fa837a26af0da21879ef328e..7bb3cabbc2d12d58b3a8163007983af9b31c1067 100644 (file)
--- 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
index b7f3db0a41ba775a93041f28bff8adfd82234a4c..7718c735e48d0ac5b22209aa74c4fc4254a20b9d 100644 (file)
--- 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
index 5693c58d4f6a35407acff36e6e29daf9e24135de..9e08c39adc232826c78e839103bfa4392c892db8 100644 (file)
--- 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
index 0805ecd4fcfe8f12b109f14f3e4b734e8113d893..3cd19118778fb5a1f8592d7a5199aa3e5189df34 100644 (file)
--- 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
index 38437e5522b26bd427bfc1ceef5cd9035117a352..3b4960640914f2a67eda4fa6f48692377cf03f35 100644 (file)
--- 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