From f53792026eeda9f8dea957fa74c73ae519072791 Mon Sep 17 00:00:00 2001
From: David Crawshaw <crawshaw@tailscale.com>
Date: Tue, 31 Aug 2021 16:36:01 -0700
Subject: [PATCH] tstest/integration/vms: move build tags from linux to
 !windows

The tests build fine on other Unix's, they just can't run there.
But there is already a t.Skip by default, so `go test` ends up
working fine elsewhere and checks the code compiles.

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
---
 tstest/integration/vms/derive_bindhost_test.go    | 7 ++++---
 tstest/integration/vms/distros_test.go            | 3 ---
 tstest/integration/vms/harness_test.go            | 4 ++--
 tstest/integration/vms/nixos_test.go              | 4 ++--
 tstest/integration/vms/opensuse_leap_15_1_test.go | 3 ---
 tstest/integration/vms/top_level_test.go          | 7 +++----
 tstest/integration/vms/vm_setup_test.go           | 4 ++--
 tstest/integration/vms/vms_steps_test.go          | 4 ++--
 tstest/integration/vms/vms_test.go                | 4 ++--
 9 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/tstest/integration/vms/derive_bindhost_test.go b/tstest/integration/vms/derive_bindhost_test.go
index bca3d0f27..7f75e3117 100644
--- a/tstest/integration/vms/derive_bindhost_test.go
+++ b/tstest/integration/vms/derive_bindhost_test.go
@@ -2,13 +2,11 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
-
 package vms
 
 import (
 	"io"
+	"runtime"
 	"testing"
 
 	"inet.af/netaddr"
@@ -41,6 +39,9 @@ func deriveBindhost(t *testing.T) string {
 }
 
 func TestDeriveBindhost(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("requires GOOS=linux")
+	}
 	t.Log(deriveBindhost(t))
 }
 
diff --git a/tstest/integration/vms/distros_test.go b/tstest/integration/vms/distros_test.go
index fc72e6ebf..00c98d9f4 100644
--- a/tstest/integration/vms/distros_test.go
+++ b/tstest/integration/vms/distros_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
-
 package vms
 
 import (
diff --git a/tstest/integration/vms/harness_test.go b/tstest/integration/vms/harness_test.go
index 7c07bed9c..ba27d4ed2 100644
--- a/tstest/integration/vms/harness_test.go
+++ b/tstest/integration/vms/harness_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms
 
diff --git a/tstest/integration/vms/nixos_test.go b/tstest/integration/vms/nixos_test.go
index a7fc63850..bd4b8227c 100644
--- a/tstest/integration/vms/nixos_test.go
+++ b/tstest/integration/vms/nixos_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms
 
diff --git a/tstest/integration/vms/opensuse_leap_15_1_test.go b/tstest/integration/vms/opensuse_leap_15_1_test.go
index b8d4a265d..71582cadf 100644
--- a/tstest/integration/vms/opensuse_leap_15_1_test.go
+++ b/tstest/integration/vms/opensuse_leap_15_1_test.go
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
-
 package vms
 
 import (
diff --git a/tstest/integration/vms/top_level_test.go b/tstest/integration/vms/top_level_test.go
index 386ae1b13..5f0744119 100644
--- a/tstest/integration/vms/top_level_test.go
+++ b/tstest/integration/vms/top_level_test.go
@@ -2,20 +2,19 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms
 
 import "testing"
 
 func TestRunUbuntu1804(t *testing.T) {
-	t.Parallel()
 	setupTests(t)
 	testOneDistribution(t, 0, Distros[0])
 }
+
 func TestRunUbuntu2004(t *testing.T) {
-	t.Parallel()
 	setupTests(t)
 	testOneDistribution(t, 1, Distros[1])
 }
diff --git a/tstest/integration/vms/vm_setup_test.go b/tstest/integration/vms/vm_setup_test.go
index 738b7d7c7..e6ffa3b3d 100644
--- a/tstest/integration/vms/vm_setup_test.go
+++ b/tstest/integration/vms/vm_setup_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms
 
diff --git a/tstest/integration/vms/vms_steps_test.go b/tstest/integration/vms/vms_steps_test.go
index 74369796c..20eb520b5 100644
--- a/tstest/integration/vms/vms_steps_test.go
+++ b/tstest/integration/vms/vms_steps_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms
 
diff --git a/tstest/integration/vms/vms_test.go b/tstest/integration/vms/vms_test.go
index 94d0cb683..756e5ae6d 100644
--- a/tstest/integration/vms/vms_test.go
+++ b/tstest/integration/vms/vms_test.go
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package vms