From 36c7af3342056179a831c19ec142f2763b310f7b Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 29 Nov 2017 19:51:57 +0000 Subject: [PATCH] all: fix plan9 build getgo doesn't work on plan9. Skip it entirely. And skip the massive slow godoc start-up test. Not worth it. Change-Id: If062b7c4c8c7c5084e607ed22085657054c10ba9 Reviewed-on: https://go-review.googlesource.com/80737 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- cmd/getgo/download.go | 2 ++ cmd/getgo/download_test.go | 2 ++ cmd/getgo/main.go | 2 ++ cmd/getgo/main_test.go | 2 ++ cmd/getgo/path.go | 2 ++ cmd/getgo/path_test.go | 2 ++ cmd/getgo/steps.go | 2 ++ cmd/getgo/system.go | 2 ++ cmd/godoc/godoc_test.go | 3 +++ 9 files changed, 19 insertions(+) diff --git a/cmd/getgo/download.go b/cmd/getgo/download.go index a68f47443a..8fdb2a7930 100644 --- a/cmd/getgo/download.go +++ b/cmd/getgo/download.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/download_test.go b/cmd/getgo/download_test.go index 1a47823c09..5a5cc29130 100644 --- a/cmd/getgo/download_test.go +++ b/cmd/getgo/download_test.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/main.go b/cmd/getgo/main.go index 8d9fbd41bb..a92ae48137 100644 --- a/cmd/getgo/main.go +++ b/cmd/getgo/main.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + // The getgo command installs Go to the user's system. package main diff --git a/cmd/getgo/main_test.go b/cmd/getgo/main_test.go index 932a739788..e430895f64 100644 --- a/cmd/getgo/main_test.go +++ b/cmd/getgo/main_test.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/path.go b/cmd/getgo/path.go index 551ac42e8c..52e0462756 100644 --- a/cmd/getgo/path.go +++ b/cmd/getgo/path.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/path_test.go b/cmd/getgo/path_test.go index 4cf66474cf..5355c6ea55 100644 --- a/cmd/getgo/path_test.go +++ b/cmd/getgo/path_test.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/steps.go b/cmd/getgo/steps.go index eac6517d6b..41c57d2459 100644 --- a/cmd/getgo/steps.go +++ b/cmd/getgo/steps.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/getgo/system.go b/cmd/getgo/system.go index 8b5b024d27..07d6f85709 100644 --- a/cmd/getgo/system.go +++ b/cmd/getgo/system.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +// +build !plan9 + package main import ( diff --git a/cmd/godoc/godoc_test.go b/cmd/godoc/godoc_test.go index 8b0c24e594..fe87128d51 100644 --- a/cmd/godoc/godoc_test.go +++ b/cmd/godoc/godoc_test.go @@ -205,6 +205,9 @@ func TestWebIndex(t *testing.T) { // Basic integration test for godoc HTTP interface. func testWeb(t *testing.T, withIndex bool) { + if runtime.GOOS == "plan9" { + t.Skip("skipping on plan9; files to start up quickly enough") + } bin, cleanup := buildGodoc(t) defer cleanup() addr := serverAddress(t)