Add build tags for integration tests
Add the necessary build tags and configuration so that integration tests can properly build against device mapper and btrfs libraries. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
parent
7e3986e88f
commit
f893e38d6d
4 changed files with 25 additions and 1 deletions
|
@ -20,6 +20,9 @@ RUN apt-get update && apt-get install -y \
|
||||||
python-minimal \
|
python-minimal \
|
||||||
libglib2.0-dev \
|
libglib2.0-dev \
|
||||||
libapparmor-dev \
|
libapparmor-dev \
|
||||||
|
btrfs-tools \
|
||||||
|
libdevmapper1.02.1 \
|
||||||
|
libdevmapper-dev \
|
||||||
--no-install-recommends \
|
--no-install-recommends \
|
||||||
&& apt-get clean
|
&& apt-get clean
|
||||||
|
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -16,7 +16,7 @@ ETCDIR ?= ${DESTDIR}/etc
|
||||||
ETCDIR_OCID ?= ${ETCDIR}/ocid
|
ETCDIR_OCID ?= ${ETCDIR}/ocid
|
||||||
GO_MD2MAN ?= $(shell which go-md2man)
|
GO_MD2MAN ?= $(shell which go-md2man)
|
||||||
export GOPATH := ${CURDIR}/vendor
|
export GOPATH := ${CURDIR}/vendor
|
||||||
BUILDTAGS := selinux seccomp
|
BUILDTAGS := selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh)
|
||||||
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
|
BASHINSTALLDIR=${PREFIX}/share/bash-completion/completions
|
||||||
|
|
||||||
all: binaries ocid.conf docs
|
all: binaries ocid.conf docs
|
||||||
|
|
7
hack/btrfs_tag.sh
Executable file
7
hack/btrfs_tag.sh
Executable file
|
@ -0,0 +1,7 @@
|
||||||
|
#!/bin/bash
|
||||||
|
cc -E - > /dev/null 2> /dev/null << EOF
|
||||||
|
#include <btrfs/version.h>
|
||||||
|
EOF
|
||||||
|
if test $? -ne 0 ; then
|
||||||
|
echo btrfs_noversion
|
||||||
|
fi
|
14
hack/libdm_tag.sh
Executable file
14
hack/libdm_tag.sh
Executable file
|
@ -0,0 +1,14 @@
|
||||||
|
#!/bin/bash
|
||||||
|
tmpdir="$PWD/tmp.$RANDOM"
|
||||||
|
mkdir -p "$tmpdir"
|
||||||
|
trap 'rm -fr "$tmpdir"' EXIT
|
||||||
|
cc -c -o "$tmpdir"/libdm_tag.o -x c - > /dev/null 2> /dev/null << EOF
|
||||||
|
#include <libdevmapper.h>
|
||||||
|
int main() {
|
||||||
|
struct dm_task *task;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
if test $? -ne 0 ; then
|
||||||
|
echo libdm_no_deferred_remove
|
||||||
|
fi
|
Loading…
Reference in a new issue