From b2cd6b7e0397f2e2da2b441613885b365c76c24c Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 26 Feb 2018 16:02:59 +0100 Subject: [PATCH] luabackend: do not assume binary paths --- modules/luabackend/test2/pdns_control | 4 ++-- modules/luabackend/test2/runtest.pl | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/luabackend/test2/pdns_control b/modules/luabackend/test2/pdns_control index f3a6f7759..8561e1066 100755 --- a/modules/luabackend/test2/pdns_control +++ b/modules/luabackend/test2/pdns_control @@ -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=./ $@ diff --git a/modules/luabackend/test2/runtest.pl b/modules/luabackend/test2/runtest.pl index 76ea069c1..3005b03f2 100755 --- a/modules/luabackend/test2/runtest.pl +++ b/modules/luabackend/test2/runtest.pl @@ -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); -- 2.40.0