]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
auth: Unset _JAVA_OPTIONS before using jdnssec 5682/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 8 Sep 2017 15:29:16 +0000 (17:29 +0200)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Mon, 11 Sep 2017 09:01:15 +0000 (11:01 +0200)
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/

(cherry picked from commit a20029adeecbf314594ca3a921ca1f2e22669e6c)

regression-tests/runtests

index e0edbffdc2169f5d2c407f8e8de65b465211a078..de0d2ec0e32b634b6114848843ad084f38058acb 100755 (executable)
@@ -15,6 +15,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=""