From: Petr Špaček <petr.spacek@nic.cz>
Date: Tue, 28 Feb 2017 10:46:04 +0000 (+0100)
Subject: tests: use tests/deckard/kresd_run.sh for check-integration target
X-Git-Tag: v1.3.0~23^2~67^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9846d54d9f2ae9c796a93a993bcc3b2f6221515d;p=thirdparty%2Fknot-resolver.git

tests: use tests/deckard/kresd_run.sh for check-integration target

Now the check-integration is (again) doing the same set of tests
as kresd_run.sh in Deckard tree.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d27630cb0..01093e136 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,11 +29,8 @@ test:linux:amd64:
 
 deckard:linux:amd64:
   stage: test
-  before_script:
-    - git submodule update --init --recursive
   script:
-    - mkdir -p tests/deckard/contrib/libswrap/obj
-    - MAKEFLAGS="-j $(nproc)" LD_LIBRARY_PATH=$(pwd)/.local/lib TESTS=sets/resolver DAEMON=$(pwd)/.local/sbin/kresd tests/deckard/kresd_run.sh
+    - PREFIX=$(pwd)/.local MAKEFLAGS="--jobs $(nproc) --keep-going" make check-integration
   dependencies:
     - build:linux:amd64
   tags:
diff --git a/tests/tests.mk b/tests/tests.mk
index f7e174e65..85a9a1323 100644
--- a/tests/tests.mk
+++ b/tests/tests.mk
@@ -11,9 +11,10 @@ TESTS := sets/resolver
 TEMPLATE := template/kresd.j2
 $(deckard_DIR)/Makefile:
 	@git submodule update --init --recursive
+
 check-integration: $(deckard_DIR)/Makefile
 	@mkdir -p $(deckard_DIR)/contrib/libswrap/obj
-	@$(MAKE) -s -C $(deckard_DIR) TESTS=$(TESTS) DAEMON=$(abspath daemon/kresd) TEMPLATE=$(TEMPLATE) DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH)
+	+TESTS=$(TESTS) DAEMON=$(abspath daemon/kresd) TEMPLATE=$(TEMPLATE) $(preload_syms) $(deckard_DIR)/kresd_run.sh
 deckard: check-integration
 
 # Targets