From f7cafd65feda94b6f21c6b6e36e2bf258e2563d3 Mon Sep 17 00:00:00 2001 From: Neutron Soutmun Date: Fri, 4 Apr 2014 10:24:22 +0700 Subject: ipset: Pass IPSET_BIN to test scripts to change binary location In the "as-installed" package testing situation, the test scripts should invokes the system installed "ipset" binary. Therefore, the IPSET_BIN could be passed to change the binary location. IPSET_BIN=/sbin/ipset ./runtest.sh The test scripts run fine in build source tree without IPSET_BIN. Signed-off-by: Neutron Soutmun Signed-off-by: Jozsef Kadlecsik --- tests/resize.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/resize.sh') diff --git a/tests/resize.sh b/tests/resize.sh index 008c607..19b93fb 100755 --- a/tests/resize.sh +++ b/tests/resize.sh @@ -1,12 +1,14 @@ #!/bin/bash -../src/ipset x resize-test 2>/dev/null +ipset=${IPSET_BIN:-../src/ipset} + +$ipset x resize-test 2>/dev/null set -e -../src/ipset n resize-test hash:ip hashsize 64 +$ipset n resize-test hash:ip hashsize 64 for x in `seq 1 32`; do for y in `seq 1 255`; do - ../src/ipset a resize-test 192.168.$x.$y + $ipset a resize-test 192.168.$x.$y done done -- cgit v1.2.3