tests: cleanup

diff --git a/.gitmodules b/.gitmodules
index 15c757c365620a7a587e269608c11f1c4910991a..23d1c2bc0d686b04339522313be6c9691f53460d 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,7 +2,7 @@
        path = contrib/libfaketime
        url = https://github.com/wolfcw/libfaketime.git
 [submodule "tests/integration"]
-       path = tests/integration
+       path = tests/deckard
        url = https://gitlab.labs.nic.cz/knot/deckard.git
 [submodule "contrib/libswrap"]
        path = contrib/libswrap

diff --git a/tests/integration b/tests/deckard
similarity index 100%
rename from tests/integration
rename to tests/deckard

diff --git a/tests/integration.mk b/tests/integration.mk
index cf140f9d6770bffc426c0e323ebc083c3c097ee2..fb6612ef848bbd660bf96590c9942019223b025a 100644 (file)
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -1,10 +1,10 @@
 # Config
-TESTS=tests/integration/sets/resolver
-TEMPLATE=template/kresd.j2
+deckard_DIR := tests/deckard
+deckard_BIN := $(deckard_DIR)/deckard.py
+TESTS := $(deckard_DIR)/sets/resolver
+TEMPLATE := template/kresd.j2
 
 # Targets
-deckard_DIR := tests/integration
-deckard := $(libfaketime_DIR)/deckard.py
 libfaketime_DIR := contrib/libfaketime
 libfaketime := $(abspath $(libfaketime_DIR))/src/libfaketime$(LIBEXT).1
 libswrap_DIR := contrib/libswrap
@@ -14,14 +14,14 @@ 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)
+       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):
+$(deckard_BIN):
        @git submodule update --init
 $(libfaketime_DIR)/Makefile:
        @git submodule update --init
@@ -39,7 +39,7 @@ $(libswrap): $(libswrap_cmake_DIR)/Makefile
        @CFLAGS="-O2 -g" $(MAKE) -s -C $(libswrap_cmake_DIR)
 
 deckard: check-integration
-check-integration: $(deckard) $(libswrap) $(libfaketime)
-       @$(preload_LIBS) $(preload_syms) python tests/integration/deckard.py $(TESTS) $(abspath daemon/kresd) $(TEMPLATE) config
+check-integration: $(deckard_BIN) $(libswrap) $(libfaketime)
+       @$(preload_LIBS) $(preload_syms) python $(deckard_BIN) $(TESTS) $(abspath daemon/kresd) $(TEMPLATE) config
 
 .PHONY: deckard check-integration