From 8f8fb407650ef167d2eb3e5347d1746f3a6f3b86 Mon Sep 17 00:00:00 2001 From: Gabriel Rosenhouse Date: Tue, 7 Nov 2017 23:01:40 -0800 Subject: [PATCH] remove build tags, just exclude entire packages --- pkg/ns/ns_suite_test.go | 1 - plugins/ipam/host-local/host_local_suite_test.go | 1 - plugins/ipam/host-local/host_local_test.go | 1 - plugins/linux_only.txt | 2 ++ plugins/main/macvlan/macvlan.go | 1 - plugins/main/macvlan/macvlan_suite_test.go | 1 - plugins/main/macvlan/macvlan_test.go | 1 - plugins/meta/portmap/chain.go | 1 - plugins/meta/portmap/chain_test.go | 1 - plugins/meta/portmap/main.go | 1 - plugins/meta/portmap/portmap.go | 1 - plugins/meta/portmap/portmap_integ_test.go | 1 - plugins/meta/portmap/portmap_suite_test.go | 1 - plugins/meta/portmap/portmap_test.go | 1 - plugins/meta/portmap/utils.go | 1 - 15 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkg/ns/ns_suite_test.go b/pkg/ns/ns_suite_test.go index 30673f371..e2adaa4e4 100644 --- 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 index 89f8eb3d4..1867ef77c 100644 --- 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 index 1f810b6d9..3e4b0d866 100644 --- 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 index 54c96c12a..f4904b38f 100644 --- 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 index ccf9453b7..0589831f9 100644 --- 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 index 3bcfae729..844e567f4 100644 --- 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 index f52fd6ed3..406264dcd 100644 --- 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 index 407d084fc..f8a53a457 100644 --- 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 index 865d4941b..5cc4cf649 100644 --- 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 index 84f97fca1..6424a777a 100644 --- 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 index 4935902fe..133dfef25 100644 --- 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 index 43eb47ca4..91a7518fe 100644 --- 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 index 0dc7cddec..ac09a0d68 100644 --- 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 index 034d00e1b..cf5ed5fbc 100644 --- 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 index 24f6dad30..a0c9b33bd 100644 --- 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");