From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 8 Sep 2017 15:29:16 +0000 (+0200)
Subject: auth: Unset _JAVA_OPTIONS before using jdnssec
X-Git-Tag: rec-4.1.0-rc1~51^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a20029adeecbf314594ca3a921ca1f2e22669e6c;p=thirdparty%2Fpdns.git

auth: Unset _JAVA_OPTIONS before using jdnssec

Travis now [1] defaults to _JAVA_OPTIONS="-Xmx2048m -Xms512m". We wouldn't
care much, except that every Java command now outputs the following line
to stderr, breaking our jdnssec diffs:

"Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m"

[1]: https://docs.travis-ci.com/user/build-environment-updates/2017-09-06/
---

diff --git a/regression-tests/runtests b/regression-tests/runtests
index b701dee743..8130f88ef3 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -16,6 +16,8 @@ export ZONE2LDAP=${ZONE2LDAP:-${PWD}/../pdns/zone2ldap}
 export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil}
 export PDNSCONTROL=${PDNSCONTROL:-${PWD}/../pdns/pdns_control}
 
+unset _JAVA_OPTIONS
+
 spectest=$1
 [ -z $spectest ] && spectest=""