From 8a914e8a0b268121ede5e54032025b4f51dd0b02 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Fri, 29 May 2020 14:38:33 -0400
Subject: default build without `varlink` tag

Issue gh#6286 was already fixed in a prior commit but the Makefile still
ran some varlink steps by default.

This commit makes any varlink build steps dependent on the varlink
build tag and also makes the contrib rpm spec file independent of
varlink.

Endpoint tests will be run only if BUILDTAGS contains varlink.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 test/endpoint/commit.go              | 2 ++
 test/endpoint/config.go              | 2 ++
 test/endpoint/endpoint.go            | 2 ++
 test/endpoint/endpoint_suite_test.go | 2 ++
 test/endpoint/exists_test.go         | 2 ++
 test/endpoint/pull_test.go           | 2 ++
 test/endpoint/setup.go               | 2 ++
 test/endpoint/version_test.go        | 2 ++
 8 files changed, 16 insertions(+)

(limited to 'test')

diff --git a/test/endpoint/commit.go b/test/endpoint/commit.go
index ab9af819f..2a8e365ae 100644
--- a/test/endpoint/commit.go
+++ b/test/endpoint/commit.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/config.go b/test/endpoint/config.go
index 15ee23547..84f8ecb4c 100644
--- a/test/endpoint/config.go
+++ b/test/endpoint/config.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import "encoding/json"
diff --git a/test/endpoint/endpoint.go b/test/endpoint/endpoint.go
index 6f4ae6b1f..20b5c577e 100644
--- a/test/endpoint/endpoint.go
+++ b/test/endpoint/endpoint.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/endpoint_suite_test.go b/test/endpoint/endpoint_suite_test.go
index 401da94c2..1cd5c2b9d 100644
--- a/test/endpoint/endpoint_suite_test.go
+++ b/test/endpoint/endpoint_suite_test.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/exists_test.go b/test/endpoint/exists_test.go
index 17e252a65..17e0fcab4 100644
--- a/test/endpoint/exists_test.go
+++ b/test/endpoint/exists_test.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/pull_test.go b/test/endpoint/pull_test.go
index 51eb9c760..25141d787 100644
--- a/test/endpoint/pull_test.go
+++ b/test/endpoint/pull_test.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/setup.go b/test/endpoint/setup.go
index 11fa77b5c..c05cc0cbb 100644
--- a/test/endpoint/setup.go
+++ b/test/endpoint/setup.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
diff --git a/test/endpoint/version_test.go b/test/endpoint/version_test.go
index a1168da70..403fca555 100644
--- a/test/endpoint/version_test.go
+++ b/test/endpoint/version_test.go
@@ -1,3 +1,5 @@
+// +build varlink
+
 package endpoint
 
 import (
-- 
cgit v1.2.3-54-g00ecf