From 03cdb6f9a523f7335a5ed41cf70d7098b01a5996 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 19 Sep 2019 13:50:30 +0200 Subject: [PATCH] Makefile: export env vars and add BATS_OPTS Signed-off-by: Valentin Rothberg --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cbc2c0e..69b388a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ SRC := ./BuildSourceImage.sh CTR_IMAGE := localhost/containers/buildsourceimage CTR_ENGINE ?= podman +BATS_OPTS ?= cleanfiles = # these are packages whose src.rpms are very small srpm_urls = \ @@ -9,6 +10,9 @@ srpm_urls = \ https://archive.kernel.org/centos-vault/7.0.1406/os/Source/SPackages/centos-bookmarks-7-1.el7.src.rpm srpms = $(addprefix ./.testprep/srpms/,$(notdir $(rpms))) +export CTR_IMAGE +export CTR_ENGINE + all: validate validate: .validate @@ -35,7 +39,7 @@ cleanfiles += .testprep $(srpms) test-integration: .build-container .testprep @echo @echo "==> Running integration tests" - CTR_IMAGE=$(CTR_IMAGE) CTR_ENGINE=$(CTR_ENGINE) TMPDIR=$(shell realpath .testprep/tmp) bats test/ + TMPDIR=$(shell realpath .testprep/tmp) bats $(BATS_OPTS) test/ clean: