tests: use makefile from deckard, cleanup

diff --git a/.gitmodules b/.gitmodules
index f65d45fb51ff1424fe83a49fdd62ea2fd5fa7ff2..380cf702eab67191638f8e69407edc3672626b35 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "contrib/libfaketime"]
-       path = contrib/libfaketime
-       url = https://github.com/wolfcw/libfaketime.git
-[submodule "contrib/libswrap"]
-       path = contrib/libswrap
-       url = https://gitlab.labs.nic.cz/labs/socket_wrapper.git
 [submodule "tests/deckard"]
        path = tests/deckard
        url = https://gitlab.labs.nic.cz/knot/deckard.git

diff --git a/contrib/libfaketime b/contrib/libfaketime
deleted file mode 160000 (submodule)
index 18f5ec0..0000000
--- a/contrib/libfaketime
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18f5ec0671705bac190787a8612fc2a58b1be1d1

diff --git a/contrib/libswrap b/contrib/libswrap
deleted file mode 160000 (submodule)
index 96f9d58..0000000
--- a/contrib/libswrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 96f9d58540f1ae6f219e85ce01a5818146bb49ee

diff --git a/tests/deckard b/tests/deckard
index 9f38df11af910ec2a0c09e6c49507e3c2877f4c8..421a66cf3f1c957844b07e084af184c55a4210d2 160000 (submodule)
--- a/tests/deckard
+++ b/tests/deckard
@@ -1 +1 @@
-Subproject commit 9f38df11af910ec2a0c09e6c49507e3c2877f4c8
+Subproject commit 421a66cf3f1c957844b07e084af184c55a4210d2

diff --git a/tests/integration.mk b/tests/integration.mk
index fb6612ef848bbd660bf96590c9942019223b025a..25b1539edc90641076e002d6db7d4c2625a4db3a 100644 (file)
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -1,45 +1,15 @@
 # Config
 deckard_DIR := tests/deckard
-deckard_BIN := $(deckard_DIR)/deckard.py
-TESTS := $(deckard_DIR)/sets/resolver
+TESTS := sets/resolver
 TEMPLATE := template/kresd.j2
 
-# Targets
-libfaketime_DIR := contrib/libfaketime
-libfaketime := $(abspath $(libfaketime_DIR))/src/libfaketime$(LIBEXT).1
-libswrap_DIR := contrib/libswrap
-libswrap_cmake_DIR := $(libswrap_DIR)/obj
-libswrap=$(abspath $(libswrap_cmake_DIR))/src/libsocket_wrapper$(LIBEXT).0
-
-# Platform-specific targets
-ifeq ($(PLATFORM),Darwin)
-       libfaketime := $(abspath $(libfaketime_DIR))/src/libfaketime.1$(LIBEXT)
-       libswrap := $(abspath $(libswrap_cmake_DIR))/src/libsocket_wrapper.0$(LIBEXT)
-       preload_syms := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES="$(libfaketime):$(libswrap)"
-else
-       preload_syms := LD_PRELOAD="$(libfaketime):$(libswrap)"
-endif
-
 # Synchronize submodules
-$(deckard_BIN):
-       @git submodule update --init
-$(libfaketime_DIR)/Makefile:
-       @git submodule update --init
-
-# Build contrib libraries
-$(libfaketime): $(libfaketime_DIR)/Makefile
-       @CFLAGS="" $(MAKE) -C $(libfaketime_DIR)
-$(libswrap_DIR):
+$(deckard_DIR):
        @git submodule update --init
-$(libswrap_cmake_DIR): $(libswrap_DIR)
-       @mkdir $(libswrap_cmake_DIR)
-$(libswrap_cmake_DIR)/Makefile: $(libswrap_cmake_DIR)
-       @cd $(libswrap_cmake_DIR); cmake ..
-$(libswrap): $(libswrap_cmake_DIR)/Makefile
-       @CFLAGS="-O2 -g" $(MAKE) -s -C $(libswrap_cmake_DIR)
 
+# Test using Deckard
 deckard: check-integration
-check-integration: $(deckard_BIN) $(libswrap) $(libfaketime)
-       @$(preload_LIBS) $(preload_syms) python $(deckard_BIN) $(TESTS) $(abspath daemon/kresd) $(TEMPLATE) config
+check-integration: $(deckard_DIR)
+       make -C $(deckard_DIR) TESTS=$(TESTS) DAEMON=$(abspath daemon/kresd) TEMPLATE=$(TEMPLATE)
 
 .PHONY: deckard check-integration