From 286d882f1eb4dc4dd702dc583af81dcf9ae5ee83 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Fri, 8 Sep 2017 10:26:03 +0200 Subject: [PATCH] Remove old glide elements for integration tests. --- Makefile | 2 +- script/test-unit | 1 - script/validate-gofmt | 2 +- script/validate-golint | 2 +- script/validate-govet | 2 +- script/validate-misspell | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fd89ccfe3..3d027bcdf 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ TRAEFIK_ENVS := \ -e CI \ -e CONTAINER=DOCKER # Indicator for integration tests that we are running inside a container. -SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/' | grep -v '^integration/vendor/') +SRCS = $(shell git ls-files '*.go' | grep -v '^vendor/') BIND_DIR := "dist" TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/containous/traefik/$(BIND_DIR)" diff --git a/script/test-unit b/script/test-unit index 4de9cd3f0..22697447d 100755 --- a/script/test-unit +++ b/script/test-unit @@ -17,7 +17,6 @@ find_dirs() { find . -not \( \ \( \ -path './integration/*' \ - -o -path './.glide/*' \ -o -path './vendor/*' \ -o -path './.git/*' \ \) \ diff --git a/script/validate-gofmt b/script/validate-gofmt index 099488443..95ab6603c 100755 --- a/script/validate-gofmt +++ b/script/validate-gofmt @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^\(integration/\)\?vendor/' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) ) unset IFS badFiles=() diff --git a/script/validate-golint b/script/validate-golint index 45f103a41..1006ba205 100755 --- a/script/validate-golint +++ b/script/validate-golint @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^\(integration/\)\?vendor/\|autogen' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/\|autogen' || true) ) unset IFS errors=() diff --git a/script/validate-govet b/script/validate-govet index af4a6f56a..6d526ad74 100755 --- a/script/validate-govet +++ b/script/validate-govet @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^\(integration/\)\?vendor/' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) ) unset IFS errors=() diff --git a/script/validate-misspell b/script/validate-misspell index e21161223..f4620b496 100755 --- a/script/validate-misspell +++ b/script/validate-misspell @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -src=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^\(integration/\)\?vendor/\|autogen' || true) ) +src=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/\|autogen' || true) ) docs=( $(validate_diff --diff-filter=ACMR --name-only -- 'docs/*.md') ) unset IFS files=("${src[@]}" "${docs[@]}")