From e9aeecf5956462f3a1b6cb21ea70280845948325 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sat, 28 Apr 2018 00:26:27 +0200 Subject: xlate-test: use locally installed xlate tools same as iptables-test: use the translate tools in the current working directory, not the system-wide ones. Signed-off-by: Florian Westphal --- xlate-test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xlate-test.py') diff --git a/xlate-test.py b/xlate-test.py index 0b371dfd..803c5b7a 100755 --- a/xlate-test.py +++ b/xlate-test.py @@ -40,7 +40,7 @@ def run_test(name, payload): for line in payload: if line.startswith(keywords): tests += 1 - process = Popen(shlex.split(line), stdout=PIPE, stderr=PIPE) + process = Popen([ os.path.abspath(os.path.curdir) + "/iptables/xtables-compat-multi" ] + shlex.split(line), stdout=PIPE, stderr=PIPE) (output, error) = process.communicate() if process.returncode == 0: translation = output.decode("utf-8").rstrip(" \n") @@ -86,6 +86,8 @@ def load_test_files(): print("%d test files, %d tests, %d tests passed, %d tests failed, %d errors" % (test_files, total_tests, total_passed, total_failed, total_error)) def main(): + os.putenv("XTABLES_LIBDIR", os.path.abspath("extensions")) + os.putenv("PATH", "%s/iptables:%s" % (os.path.abspath(os.path.curdir), os.getenv("PATH"))) if args.test: if not args.test.endswith(".txlate"): args.test += ".txlate" -- cgit v1.2.3