From patchwork Fri Apr 27 22:26:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 905974 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40XpSm11LLz9s0p for ; Sat, 28 Apr 2018 08:26:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932432AbeD0W0r (ORCPT ); Fri, 27 Apr 2018 18:26:47 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:40474 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753569AbeD0W0q (ORCPT ); Fri, 27 Apr 2018 18:26:46 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1fCBpF-00045C-4D; Sat, 28 Apr 2018 00:26:45 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH iptables] xlate-test: use locally installed xlate tools Date: Sat, 28 Apr 2018 00:26:27 +0200 Message-Id: <20180427222627.18966-1-fw@strlen.de> X-Mailer: git-send-email 2.16.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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(-) diff --git a/xlate-test.py b/xlate-test.py index 0b371dfd8793..803c5b7a2ab4 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"