From a744965c6752fe38424d5bfcf55acc1b938f11ca Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Wed, 5 Oct 2016 12:51:58 +0100 Subject: [PATCH 1/2] add missing deps on server object files when building check binaries --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4b2102a..eb7cd81 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ CHECK_OBJ := $(CHECK_SRC:tests/unit/%.c=build/%.o) CHECK_BINS := $(CHECK_SRC:tests/unit/%.c=build/%) build/check_%: build/check_%.o - $(LINK) $^ -o $@ $(COMMON_OBJ) -lcheck + $(LINK) $^ -o $@ $(COMMON_OBJ) $(SERVER_OBJ) -lcheck check_objs: $(CHECK_OBJ) From 5da77ea39afcedf7c599d10603e4083277882ab3 Mon Sep 17 00:00:00 2001 From: "James F. Carter" Date: Wed, 5 Oct 2016 12:52:32 +0100 Subject: [PATCH 2/2] remove unnecessary step in gitlab-ci --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ee6917..14cb6af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,5 +7,4 @@ unit_test: script: - rake clean - rake flexnbd - - rake flexnbd_proxy - rake test:run