From 5e3d4f307cbbb53200b07b87822f979712e29515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 4 Dec 2020 16:09:21 +0100
Subject: [PATCH] fix: double quote tags if they are set (#531)

* fix: double quote tags if they are set

* chore: control skip tags too
---
 e2e/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/e2e/Makefile b/e2e/Makefile
index e82bbe8229..e9110e5471 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -17,6 +17,14 @@ ifeq ($(SKIP_SCENARIOS),true)
 ## We always want to skip scenarios tagged with @skip
 TAGS+= && ~skip
 endif
+
+# Double quote only if the tags are set
+TAGS_VALUE="$(TAGS)"
+else
+ifeq ($(SKIP_SCENARIOS),true)
+TAGS_FLAG=--tags
+TAGS_VALUE="~skip"
+endif
 endif
 
 GO_IMAGE_TAG?='stretch'
@@ -54,7 +62,7 @@ functional-test: install-godog
 	TIMEOUT_FACTOR=${TIMEOUT_FACTOR} \
 	STACK_VERSION=${STACK_VERSION} \
 	DEVELOPER_MODE=${DEVELOPER_MODE} \
-	godog --format=${FORMAT} ${TAGS_FLAG} "${TAGS}"
+	godog --format=${FORMAT} ${TAGS_FLAG} ${TAGS_VALUE}
 
 .PHONY: lint
 lint: