From patchwork Fri Nov 6 03:12:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Di Proietto X-Patchwork-Id: 540797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 2E2E51402D7 for ; Fri, 6 Nov 2015 14:13:42 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id EB32C22C3B4; Thu, 5 Nov 2015 19:12:51 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 3574D22C386 for ; Thu, 5 Nov 2015 19:12:49 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 858FE162E92 for ; Thu, 5 Nov 2015 20:12:48 -0700 (MST) X-ASG-Debug-ID: 1446779568-03dc2158dc313b0001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id RvGgn97QrmjihXQd (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 05 Nov 2015 20:12:48 -0700 (MST) X-Barracuda-Envelope-From: diproiettod@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO smtp-outbound-1.vmware.com) (208.91.2.12) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 6 Nov 2015 03:24:23 -0000 Received-SPF: error (mx3-pf3.cudamail.com: error in processing during lookup of vmware.com: DNS problem) X-Barracuda-Apparent-Source-IP: 208.91.2.12 X-Barracuda-RBL-IP: 208.91.2.12 Received: from sc9-mailhost3.vmware.com (sc9-mailhost3.vmware.com [10.113.161.73]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 08B2028691 for ; Thu, 5 Nov 2015 19:12:47 -0800 (PST) Received: from diproiettod-dev.localdomain (unknown [10.33.74.202]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 0B0514024F; Thu, 5 Nov 2015 19:12:47 -0800 (PST) X-CudaMail-Envelope-Sender: diproiettod@vmware.com From: Daniele Di Proietto To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1104071691 X-CudaMail-DTE: 110515 X-CudaMail-Originating-IP: 208.91.2.12 Date: Thu, 5 Nov 2015 19:12:42 -0800 X-ASG-Orig-Subj: [##CM-V3-1104071691##][PATCH v2 11/11] system-kmod-macros: Do not require the 'conntrack' tool. Message-Id: <1446779562-3837-12-git-send-email-diproiettod@vmware.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446779562-3837-1-git-send-email-diproiettod@vmware.com> References: <1446779562-3837-1-git-send-email-diproiettod@vmware.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1446779568 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH v2 11/11] system-kmod-macros: Do not require the 'conntrack' tool. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" We can use 'test-ovs test-netlink-conntrack' instead. Now that it is not required anymore, we can remove the HAVE_CONNTRACK macro in the build system. Signed-off-by: Daniele Di Proietto --- tests/atlocal.in | 7 ------- tests/system-kmod-macros.at | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tests/atlocal.in b/tests/atlocal.in index b234c52..5815c6c 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -111,13 +111,6 @@ if test "$IS_WIN32" = "yes"; then HAVE_PYTHON="no" fi -# Conntrack test requirements -if test x`which conntrack 2>/dev/null` != x; then - HAVE_CONNTRACK="yes" -else - HAVE_CONNTRACK="no" -fi - if test "$HAVE_PYTHON" = "yes" \ && test "x`$PYTHON $abs_top_srcdir/tests/test-l7.py --help | grep 'ftp'`" != x; then HAVE_PYFTPDLIB="yes" diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index a48e8d9..3b8edbc 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -50,12 +50,11 @@ m4_define([OVS_TRAFFIC_VSWITCHD_STOP], # kernel conntrack tables when the test is finished. # m4_define([CHECK_CONNTRACK], - [AT_SKIP_IF([test $HAVE_CONNTRACK = no]) - AT_SKIP_IF([test $HAVE_PYTHON = no]) + [AT_SKIP_IF([test $HAVE_PYTHON = no]) m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6]], [modprobe mod || echo "Module mod not loaded." on_exit 'modprobe -r mod' ]) - on_exit 'conntrack -F' + on_exit 'ovstest test-netlink-conntrack flush' ] )