From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 3 Dec 2015 22:29:34 +0000 (+0100)
Subject: build: updated travis, deckard
X-Git-Tag: v1.0.0-beta3~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be67dd6e4c4612760e2172ad5bc747f9add70a69;p=thirdparty%2Fknot-resolver.git

build: updated travis, deckard
---

diff --git a/.travis.yml b/.travis.yml
index a606acc18..de7ed40c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ env:
 before_script:
     - ./scripts/bootstrap-depends.sh ${HOME}/.local
 script:
-    - make -j2 install check AMALG=yes COVERAGE=1 PREFIX=${HOME}/.local
+    - make -j2 install check COVERAGE=1 PREFIX=${HOME}/.local
     - ./daemon/kresd -h
     - make -j2 check-integration COVERAGE=1 PREFIX=${HOME}/.local
 after_success:
diff --git a/tests/deckard b/tests/deckard
index 902995b54..e6191b218 160000
--- a/tests/deckard
+++ b/tests/deckard
@@ -1 +1 @@
-Subproject commit 902995b5439a3637019d3af7d12e057f6ba699b4
+Subproject commit e6191b2183f8d79972f6df7c7e0edaf4a5eb2855