From patchwork Tue May 24 00:57:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 625452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rDH8N5ZPHz9t50 for ; Tue, 24 May 2016 10:58:12 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 4FC1F108D5; Mon, 23 May 2016 17:58:11 -0700 (PDT) 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 D6EDF108D4 for ; Mon, 23 May 2016 17:58:09 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 5CA1B16258B for ; Mon, 23 May 2016 18:58:09 -0600 (MDT) X-ASG-Debug-ID: 1464051487-0b323743ec3aeae0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar6.cudamail.com with ESMTP id oIdLjkzrRs3niGHC (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 23 May 2016 18:58:07 -0600 (MDT) X-Barracuda-Envelope-From: cascardo@redhat.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mx1.redhat.com) (209.132.183.28) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 24 May 2016 00:58:07 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at _spf1.redhat.com designates 209.132.183.28 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-Barracuda-RBL-IP: 209.132.183.28 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E50C912B98 for ; Tue, 24 May 2016 00:58:05 +0000 (UTC) Received: from indiana.gru.redhat.com (ovpn-116-69.phx2.redhat.com [10.3.116.69]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4O0w4b8017580 for ; Mon, 23 May 2016 20:58:05 -0400 X-CudaMail-Envelope-Sender: cascardo@redhat.com From: Thadeu Lima de Souza Cascardo To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-522069622 X-CudaMail-DTE: 052316 X-CudaMail-Originating-IP: 209.132.183.28 Date: Mon, 23 May 2016 21:57:52 -0300 X-ASG-Orig-Subj: [##CM-E1-522069622##][PATCH] system-tests: fix module removal during cleanup Message-Id: <1464051472-10509-1-git-send-email-cascardo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 24 May 2016 00:58:05 +0000 (UTC) X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1464051487 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 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 Subject: [ovs-dev] [PATCH] system-tests: fix module removal during cleanup 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" Currently, cleanup files for system tests will look like this: modprobe -q -r vport_vxlan modprobe -q -r vport_sttmodprobe modprobe -q -r vport_lispmodprobe modprobe -q -r vport_gremodprobe modprobe -q -r vport_genevemodprobe modprobe -r openvswitch This is caused by a missing newline in m4_foreach EXPRESSION and the fact that on_exit is a shell function. It was being expanded like this: on_exit 'modprobe -q -r vport_genevemodprobe' -q vport_gre Fixes: 53eb8cb83013 ("tests: Replace ON_EXIT m4 macro by on_exit() shell function.") Signed-off-by: Thadeu Lima de Souza Cascardo --- tests/system-kmod-macros.at | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 8e60929..cee0510 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -20,7 +20,8 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], on_exit 'modprobe -r openvswitch' m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], [vport_stt], [vport_vxlan]], [modprobe -q mod || echo "Module mod not loaded." - on_exit 'modprobe -q -r mod']) + on_exit 'modprobe -q -r mod' + ]) on_exit 'ovs-dpctl del-dp ovs-system' _OVS_VSWITCHD_START([]) dnl Add bridges, ports, etc.