github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 17:22:33 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: makefile fix .ci path

Browse Source 
If enter to vircontainers directory and do make check-go-test, the makefile
does not found the kata .ci directory use relative path to makefile.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2019-03-05 13:51:22 -06:00
parent fcee080a2d
commit c964a26476
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
virtcontainers/Makefile
View File

@ -1,3 +1,9 @@
#
# Copyright (c) 2019 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
PREFIX := /usr PREFIX := /usr
BIN_DIR := $(PREFIX)/bin BIN_DIR := $(PREFIX)/bin
VC_BIN_DIR := $(BIN_DIR)/virtcontainers/bin VC_BIN_DIR := $(BIN_DIR)/virtcontainers/bin
@ -10,6 +16,7 @@ CC_SHIM_DIR := shim/mock/cc-shim
CC_SHIM_BIN := cc-shim CC_SHIM_BIN := cc-shim
KATA_SHIM_DIR := shim/mock/kata-shim KATA_SHIM_DIR := shim/mock/kata-shim
KATA_SHIM_BIN := kata-shim KATA_SHIM_BIN := kata-shim
MK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
# #
# Pretty printing # Pretty printing
@ -49,10 +56,10 @@ binaries: virtc hook cc-shim kata-shim
check: check-go-static check-go-test check: check-go-static check-go-test
check-go-static: check-go-static:
bash .ci/go-lint.sh bash $(MK_DIR)/../.ci/go-lint.sh
check-go-test: check-go-test:
bash .ci/go-test.sh \ bash $(MK_DIR)/../.ci/go-test.sh \
$(TEST_BIN_DIR)/$(CC_SHIM_BIN) \ $(TEST_BIN_DIR)/$(CC_SHIM_BIN) \
$(TEST_BIN_DIR)/$(KATA_SHIM_BIN) \ $(TEST_BIN_DIR)/$(KATA_SHIM_BIN) \
$(TEST_BIN_DIR)/$(HOOK_BIN) $(TEST_BIN_DIR)/$(HOOK_BIN)