Verified Commit 6c04ef59 authored by Karel Koci's avatar Karel Koci 🤘

Use system wide check instead of our own version

There is no reason why we should have our own version of check bundled
in. We can use system wide version instead.
parent 5ab6bca5
......@@ -8,7 +8,7 @@ RUN \
apt-get -y install --no-install-recommends \
busybox ca-certificates curl git \
make pkg-config gcc cmake \
cppcheck valgrind \
check cppcheck valgrind \
libcurl4-openssl-dev libevent-dev \
lua5.1 liblua5.1-0-dev \
asciidoc lcov markdown libcommon-sense-perl \
......
[submodule "build"]
path = build
url = https://gitlab.labs.nic.cz/turris/buildsystem.git
[submodule "tests/check"]
path = tests/check
url = https://github.com/libcheck/check.git
[submodule "tests/lunit-launch/lunit"]
path = tests/lunit-launch/lunit
url = http://repo.or.cz/lunit.git
......
......@@ -5,19 +5,12 @@ BINARIES_NOTARGET += tests/locks
locks_MODULES += locks
locks_LOCAL_LIBS += updater
$(O)/tests/check-compiled/compiled:
mkdir -p $(O)/tests/check-compiled
cd $(O)/tests/check-compiled && cmake $(abspath $(S))/tests/check -DHAVE_SUBUNIT=0
+make -C $(O)/tests/check-compiled
touch $(O)/tests/check-compiled/compiled
$(O)/tests/luacheck-compiled/bin/luacheck:
mkdir -p $(O)/tests/luacheck-compiled
cd $(S)/tests/luacheck && ./install.lua $(abspath $(O)/tests/luacheck-compiled)
clean: check-clean
check-clean:
rm -rf $(O)/tests/check-compiled
rm -rf $(O)/tests/luacheck-compiled
C_TESTS := \
......@@ -72,12 +65,9 @@ define DO_C_TEST
BINARIES_NOTARGET += tests/ctest-$(1)
ctest-$(1)_MODULES += $(1) uriinternal.embed ctest
$$(patsubst %,$(O)/.objs/tests/%.o,$$(ctest-$(1)_MODULES)): $(O)/tests/check-compiled/compiled
ctest-$(1)_SYSTEM_LIBS += check m rt
ctest-$(1)_SYSTEM_LIBS += m rt
ctest-$(1)_PKG_CONFIGS += check
ctest-$(1)_LOCAL_LIBS += updater
$(O)/bin/ctest-$(1): EXTRA_LIBDIRS := $(O)/tests/check-compiled/src/
$(O)/bin/ctest-$(1): EXTRA_INCLUDES := $(O)/tests/check-compiled/src $(S)/tests/check/src/ $(S)/tests/check-compiled/
$(O)/bin/ctest-$(1): $(O)/tests/check-compiled/compiled
test: test-c-$(1)
valgrind: valgrind-c-$(1)
......
Subproject commit db24aacf1fdb41371aef16f6d8c2bb68b890f529
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment