From: Austin Clements <austin@google.com>
Date: Mon, 26 Sep 2022 20:04:10 +0000 (-0400)
Subject: cmd/dist: eliminate "time" special case
X-Git-Tag: go1.20rc1~219
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=80d8c77a43f2445a78bd5b5c3b113c95e49766a9;p=gostls13.git

cmd/dist: eliminate "time" special case

The registerTest function has a special case for commands that start
with "time", but we don't use this case anywhere. Delete this special
case and its support code.

Preparation for #37486.

Change-Id: Ica180417e7aa4e4fc260cb97467942bae972fdb6
Reviewed-on: https://go-review.googlesource.com/c/go/+/448801
Run-TryBot: Austin Clements <austin@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 5558bc1819..1d1f325bc7 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -68,7 +68,6 @@ type tester struct {
 
 	cgoEnabled bool
 	partial    bool
-	haveTime   bool // the 'time' binary is available
 
 	tests        []distTest
 	timeoutScale int
@@ -111,12 +110,6 @@ func (t *tester) run() {
 
 	t.runNames = flag.Args()
 
-	if t.hasBash() {
-		if _, err := exec.LookPath("time"); err == nil {
-			t.haveTime = true
-		}
-	}
-
 	// Set GOTRACEBACK to system if the user didn't set a level explicitly.
 	// Since we're running tests for Go, we want as much detail as possible
 	// if something goes wrong.
@@ -891,9 +884,6 @@ func (t *tester) isRegisteredTestName(testName string) bool {
 
 func (t *tester) registerTest(name, dirBanner string, cmdline ...interface{}) {
 	bin, args := flattenCmdline(cmdline)
-	if bin == "time" && !t.haveTime {
-		bin, args = args[0], args[1:]
-	}
 	if t.isRegisteredTestName(name) {
 		panic("duplicate registered test name " + name)
 	}