tests: xlate: Test built binary by default

Testing the host's iptables-translate by default is unintuitive. Since
the ipset-translate symlink is created upon 'make install', add a local
symlink to the repository pointing at a built binary in src/. Using this
by default is consistent with the regular testsuite.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/tests/xlate/ipset-translate b/tests/xlate/ipset-translate
new file mode 120000 (symlink)
index 0000000..91980c1
--- /dev/null
+++ b/tests/xlate/ipset-translate
@@ -0,0 +1 @@
+../../src/ipset
\ No newline at end of file

diff --git a/tests/xlate/runtest.sh b/tests/xlate/runtest.sh
index a2a02c05d75736d8b09b27d3d428296f3b0efc05..6a2f80c0d9e611d1c1dc00a85169c6fd62c66a09 100755 (executable)
--- a/tests/xlate/runtest.sh
+++ b/tests/xlate/runtest.sh
@@ -6,14 +6,10 @@ if [ ! -x "$DIFF" ] ; then
        exit 1
 fi
 
-IPSET_XLATE=$(which ipset-translate)
-if [ ! -x "$IPSET_XLATE" ] ; then
-       echo "ERROR: ipset-translate is not installed yet"
-       exit 1
-fi
+ipset_xlate=${IPSET_XLATE_BIN:-$(dirname $0)/ipset-translate}
 
 TMP=$(mktemp)
-ipset-translate restore < xlate.t &> $TMP
+$ipset_xlate restore < xlate.t &> $TMP
 if [ $? -ne 0 ]
 then
        cat $TMP