]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
luabackend: do not assume binary paths
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 26 Feb 2018 15:02:59 +0000 (16:02 +0100)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 1 May 2018 12:12:10 +0000 (14:12 +0200)
modules/luabackend/test2/pdns_control
modules/luabackend/test2/runtest.pl

index f3a6f77592228d4a131d576a1f7bb72d49e5db59..8561e1066b9c91c65793c6c67fa94ce7f015e038 100755 (executable)
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-
-../../../pdns/pdns_control --config-dir=./ --socket-dir=./ $@
+PDNSCONTROL=${PDNSCONTROL:-${PWD}/../../../pdns/pdns_control}
+$PDNSCONTROL --config-dir=./ --socket-dir=./ $@
index 76ea069c13cee0845b81f4d1e07ac624750f214f..3005b03f2b863a07c75c007b513222e02ea07c9e 100755 (executable)
@@ -8,7 +8,9 @@ use 5.10.0; # somewhat sane minimum?
 # standard perl
 use Test::More;
 
-my $sdig = 'timeout 3 ../../../pdns/sdig 127.0.0.1 5300';
+my $sdigpath = '../../../pdns/sdig';
+if (defined($ENV{SDIG})) { $sdigpath = $ENV{SDIG} }
+my $sdig = "timeout 3 $sdigpath 127.0.0.1 5300";
 
 exit main(@ARGV);