bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '29-fix-linker-issue' into 'master'

Browse Source 
Link against subunit for testing.

This fixes the problems in Debian stretch+.

Closes #29

See merge request !26
This commit is contained in:
Michel Pollet
2016-10-13 16:47:37 +01:00
parent b4cb2d9240 72992c76ac
commit 1a768d5e9c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -1,7 +1,7 @@
image: "ruby:2.1" image: "ruby:2.1"
before_script: before_script:
- apt-get update; apt-get install -y check libev-dev net-tools dpkg-dev - apt-get update; apt-get install -y check libev-dev net-tools dpkg-dev libsubunit-dev
unit_test: unit_test:
script: script:

2
Makefile
View File

@@ -94,7 +94,7 @@ CHECK_OBJ := $(CHECK_SRC:tests/unit/%.c=build/%.o)
CHECK_BINS := $(CHECK_SRC:tests/unit/%.c=build/%) CHECK_BINS := $(CHECK_SRC:tests/unit/%.c=build/%)
build/check_%: build/check_%.o build/check_%: build/check_%.o
$(LINK) $^ -o $@ $(COMMON_OBJ) $(SERVER_OBJ) -lcheck $(LINK) $^ -o $@ $(COMMON_OBJ) $(SERVER_OBJ) -lcheck -lsubunit
check_objs: $(CHECK_OBJ) check_objs: $(CHECK_OBJ)