From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 19 Nov 2015 18:17:27 +0000 (+0100)
Subject: tests: cleanup
X-Git-Tag: v1.0.0-beta2~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b871c90dd49bd9db4ca06ada6e087ef266793c;p=thirdparty%2Fknot-resolver.git

tests: cleanup
---

diff --git a/.gitmodules b/.gitmodules
index 15c757c36..23d1c2bc0 100644
--- 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 cf140f9d6..fb6612ef8 100644
--- 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