remove build tags, just exclude entire packages

containernetworking · Nov 8, 2017 · 8f8fb40 · 8f8fb40
1 parent a686303
commit 8f8fb40
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 14 deletions.
diff --git a/pkg/ns/ns_suite_test.go b/pkg/ns/ns_suite_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2016 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/ipam/host-local/host_local_suite_test.go b/plugins/ipam/host-local/host_local_suite_test.go
@@ -1,4 +1,3 @@
-// +build !windows
 // Copyright 2016 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/ipam/host-local/host_local_test.go b/plugins/ipam/host-local/host_local_test.go
@@ -1,4 +1,3 @@
-// +build !windows
 // Copyright 2016 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/linux_only.txt b/plugins/linux_only.txt
@@ -4,6 +4,8 @@ plugins/ipam/host-local
 plugins/main/bridge
 plugins/main/ipvlan
 plugins/main/loopback
+plugins/main/macvlan
 plugins/main/ptp
 plugins/main/vlan
+plugins/meta/portmap
 plugins/meta/tuning
diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/main/macvlan/macvlan_suite_test.go b/plugins/main/macvlan/macvlan_suite_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2016 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/main/macvlan/macvlan_test.go b/plugins/main/macvlan/macvlan_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2015 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/chain.go b/plugins/meta/portmap/chain.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/chain_test.go b/plugins/meta/portmap/chain_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/main.go b/plugins/meta/portmap/main.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/portmap.go b/plugins/meta/portmap/portmap.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/portmap_integ_test.go b/plugins/meta/portmap/portmap_integ_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/portmap_suite_test.go b/plugins/meta/portmap/portmap_suite_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/portmap_test.go b/plugins/meta/portmap/portmap_test.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/plugins/meta/portmap/utils.go b/plugins/meta/portmap/utils.go
@@ -1,4 +1,3 @@
-// +build linux
 // Copyright 2017 CNI authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");