From 6cb6e38bbb590872ab99ed7668945b5ecc08be6d Mon Sep 17 00:00:00 2001 From: Birger Schmidt Date: Tue, 28 Feb 2017 13:04:52 +0100 Subject: [PATCH] disable end-to-end tests for non Linux OSes in Makefile The End-to-end tests as they are now, are very dependent on running on Linux. This makes the Makefile more OS agnostic regarding end to end tests. --- Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index acf2b5cb..c0dfe7df 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,19 @@ BIN_DIR ?= $(shell pwd) DOCKER_IMAGE_NAME ?= node-exporter DOCKER_IMAGE_TAG ?= $(subst /,-,$(shell git rev-parse --abbrev-ref HEAD)) +ifeq ($(OS),Windows_NT) + OS_detected := Windows +else + OS_detected := $(shell uname -s) +endif -all: format build test test-e2e +ifeq ($(OS_detected), Linux) + test-e2e := test-e2e +else + test-e2e := skip-test-e2e +endif + +all: format build test $(test-e2e) style: @echo ">> checking code style" @@ -36,6 +47,9 @@ test-e2e: build @echo ">> running end-to-end tests" ./end-to-end-test.sh +skip-test-e2e: + @echo ">> SKIP running end-to-end tests on $(OS_detected)" + format: @echo ">> formatting code" @$(GO) fmt $(pkgs)