build: cleanup, no python deps

diff --git a/.travis.yml b/.travis.yml
index 2554a46f5fac6a202236ba7d8550fe34f2f6d89f..0256d458749b9db47f0b8f6b0b87cd41756252fb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_script:
 script:
     - make -j2 install COVERAGE=1 PREFIX=${HOME}/.local
     - ./daemon/kresd -h
-    - make check COVERAGE=1 PREFIX=${HOME}/.local
+    - make -j2 check COVERAGE=1 PREFIX=${HOME}/.local
     - make -j2 check-integration COVERAGE=1 PREFIX=${HOME}/.local
 after_success:
     - test $TRAVIS_OS_NAME = linux && coveralls -i lib -i daemon -x ".c" --gcov-options '\-lp'

diff --git a/Makefile b/Makefile
index 047ba8ed4148b86f6b99124f5d31b1f2f9d9fa8d..9467260831d656b4305af8b1f06f5571df7fb2d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ $(eval $(call find_alt,lua,luajit))
 $(eval $(call find_lib,cmocka))
 $(eval $(call find_bin,doxygen))
 $(eval $(call find_bin,sphinx-build))
-$(eval $(call find_bin,python))
 $(eval $(call find_lib,libmemcached,1.0))
 $(eval $(call find_lib,hiredis))
 $(eval $(call find_lib,socket_wrapper))
@@ -43,7 +42,7 @@ ifneq (,$(findstring luajit, $(lua_LIBS)))
 endif
 endif
 
-BUILD_CFLAGS += $(libknot_CFLAGS) $(libuv_CFLAGS) $(cmocka_CFLAGS) $(python_CFLAGS) $(lua_CFLAGS) $(libdnssec_CFLAGS)
+BUILD_CFLAGS += $(libknot_CFLAGS) $(libuv_CFLAGS) $(cmocka_CFLAGS) $(lua_CFLAGS) $(libdnssec_CFLAGS)
 
 # Overview
 info:
@@ -70,7 +69,6 @@ info:
        $(info [$(HAS_libmemcached)] libmemcached (modules/memcached))
        $(info [$(HAS_hiredis)] hiredis (modules/redis))
        $(info [$(HAS_cmocka)] cmocka (tests/unit))
-       $(info [$(HAS_python)] Python (tests/integration))
        $(info [$(HAS_socket_wrapper)] socket_wrapper (lib))
        $(info )
 

diff --git a/config.mk b/config.mk
index a59d8690581e4b125c883457a95302c0ac7329ab..db7d462ba1fb2ed37b15c5637c1dc17528283a93 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -19,4 +19,3 @@ RM    := rm -f
 LN      := ln -s
 XXD     := ./scripts/embed.sh
 INSTALL := install
-PYTHON  := python

diff --git a/tests/deckard b/tests/deckard
index 9650d08110c15a6ed80f072c877f160b12c1f351..604f256f2fdb7028368b875f493092bb9fd4ef13 160000 (submodule)
--- a/tests/deckard
+++ b/tests/deckard
@@ -1 +1 @@
-Subproject commit 9650d08110c15a6ed80f072c877f160b12c1f351
+Subproject commit 604f256f2fdb7028368b875f493092bb9fd4ef13

diff --git a/tests/integration.mk b/tests/integration.mk
deleted file mode 100644 (file)
index 25b1539..0000000
--- a/tests/integration.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Config
-deckard_DIR := tests/deckard
-TESTS := sets/resolver
-TEMPLATE := template/kresd.j2
-
-# Synchronize submodules
-$(deckard_DIR):
-       @git submodule update --init
-
-# Test using Deckard
-deckard: check-integration
-check-integration: $(deckard_DIR)
-       make -C $(deckard_DIR) TESTS=$(TESTS) DAEMON=$(abspath daemon/kresd) TEMPLATE=$(TEMPLATE)
-
-.PHONY: deckard check-integration

diff --git a/tests/tests.mk b/tests/tests.mk
index 044cae309cd7442fc8b7312f05eed00db645ba9d..a2a57237862963d235f1398151098104dd4c52e2 100644 (file)
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -1,12 +1,3 @@
-# Preload libraries
-preload_PATH := $(abspath contrib/libfaketime/src)
-ifeq ($(PLATFORM),Darwin)
-       preload_LIBS := DYLD_FORCE_FLAT_NAMESPACE=1 \
-                       DYLD_LIBRARY_PATH="$(preload_PATH):${DYLD_LIBRARY_PATH}"
-else
-       preload_LIBS := LD_LIBRARY_PATH="$(preload_PATH):${LD_LIBRARY_PATH}"
-endif
-
 # Unit tests
 ifeq ($(HAS_cmocka), yes)
 include tests/unit.mk
@@ -14,13 +5,18 @@ else
 $(warning cmocka not found, skipping unit tests)
 endif
 
-# Integration tests
-ifeq ($(HAS_python)|$(HAS_socket_wrapper), yes|yes)
-include tests/integration.mk
-endif
+# Integration tests with Deckard
+deckard_DIR := tests/deckard
+TESTS := sets/resolver
+TEMPLATE := template/kresd.j2
+$(deckard_DIR)/Makefile:
+       @git submodule update --init
+check-integration: $(deckard_DIR)/Makefile
+       @make -C $(deckard_DIR) TESTS=$(TESTS) DAEMON=$(abspath daemon/kresd) TEMPLATE=$(TEMPLATE)
+deckard: check-integration
 
 # Targets
 tests: check-unit
 tests-clean: $(foreach test,$(tests_BIN),$(test)-clean)
 
-.PHONY: tests tests-clean
+.PHONY: tests tests-clean check-integration deckard