From patchwork Mon Jul 29 11:48:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 1138327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45xyds3z50z9s3l for ; Mon, 29 Jul 2019 21:49:20 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9D2DC168B; Mon, 29 Jul 2019 11:49:18 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D0821167E for ; Mon, 29 Jul 2019 11:48:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 486CB604 for ; Mon, 29 Jul 2019 11:48:41 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id n9so61602702wru.0 for ; Mon, 29 Jul 2019 04:48:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=znl5Fmu02xS1RQmDZJWy+Z8LqK0FBOLvAWeD7VDk6Jo=; b=ZAzHZRJCl8NixmbchfbMCrEWiumjbGHkSBudzrrXjup2Ib8D+FrqkgNFbn09D/ovUR PPOln9Api6BJfAAUPnNUE8KRUVAW4vR5gtIRShGAYd8E8yJmh6GRSyUxR1pne+Kj6TSq 9Ue9JYDStMyYqSwuAUiBi1r3ba9T2Hbw45fwwwRpXLHYtO5Y9Ho2tzXSKDDsUYhxDmmJ b1W/f/yqmWwsF319pYwdig2je6ODeBXWTPeHmArJS78NPPQTfZ3LogDnp8yavd1VGYrb JW00wbmxTZUGSEQy/iYGc0282Ynn6xuXZr+lQCRcEBMQCdQjhRkvD5OsNVIC3sdkUkOY 60hg== X-Gm-Message-State: APjAAAVZk/jL1dALTRaKSJGyUogvHcPnTQ88dC13S+1Vp5/cI/rsy9P2 OB1zWPqzB33JzyCxpzRC51iz/33Y32Y= X-Google-Smtp-Source: APXvYqy9wFNPneLWF39cLW5f0mtLacDcDMWcs+ZvIv28dHXiXizq6fjJYj+3ZWRwLrPpcpU7dldibQ== X-Received: by 2002:adf:ff84:: with SMTP id j4mr16739332wrr.71.1564400919485; Mon, 29 Jul 2019 04:48:39 -0700 (PDT) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id x24sm57912140wmh.5.2019.07.29.04.48.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 04:48:38 -0700 (PDT) From: Lorenzo Bianconi To: ovs-dev@openvswitch.org Date: Mon, 29 Jul 2019 13:48:33 +0200 Message-Id: X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] test: do not require python2 for CHECK_CONNTRACK macro X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Do not strictly require python2 for CHECK_CONNTRACK macro definitions in system-{kmod,userspace}-macros.at Signed-off-by: Lorenzo Bianconi --- tests/system-kmod-macros.at | 2 +- tests/system-userspace-macros.at | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 554a61e9b..48e94642b 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -59,7 +59,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # kernel conntrack tables when the test is finished. # m4_define([CHECK_CONNTRACK], - [AT_SKIP_IF([test $HAVE_PYTHON2 = no]) + [AT_SKIP_IF([test $HAVE_PYTHON = no]) m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp], [nf_nat_tftp]], [modprobe mod || echo "Module mod not loaded." diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at index 9d5f3bf41..a411e3d89 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -65,7 +65,7 @@ m4_define([CONFIGURE_VETH_OFFLOADS], # Perform requirements checks for running conntrack tests. # m4_define([CHECK_CONNTRACK], - [AT_SKIP_IF([test $HAVE_PYTHON2 = no])] + [AT_SKIP_IF([test $HAVE_PYTHON = no])] ) # CHECK_CONNTRACK_ALG()