From patchwork Mon Apr 16 13:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 898628 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=none (p=none dis=none) header.from=ovn.org 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 40Pq4B3wxcz9s08 for ; Mon, 16 Apr 2018 23:29:46 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 61AC3E1F; Mon, 16 Apr 2018 13:29:44 +0000 (UTC) X-Original-To: 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 3A255E10 for ; Mon, 16 Apr 2018 13:29:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 759E3473 for ; Mon, 16 Apr 2018 13:29:42 +0000 (UTC) X-Originating-IP: 82.79.245.216 Received: from localhost.localdomain (unknown [82.79.245.216]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 245CFE0012; Mon, 16 Apr 2018 15:29:40 +0200 (CEST) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 16 Apr 2018 16:29:27 +0300 Message-Id: <20180416132927.1480-1-aserdean@ovn.org> X-Mailer: git-send-email 2.16.1.windows.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH] ovsdb-tool: Skip monitor argument on Windows 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The daemon argument '--monitor' does not exist on Windows so the process will complain: +2018-04-16T13:10:24Z|00001|getopt_long|WARN|unknown option -- monitor +ovsdb-server: Failed to read from child (The pipe has been ended. +) Skip the argument when running the test under Windows. Signed-off-by: Alin Gabriel Serdean --- tests/ovsdb-tool.at | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index ab766be24..7df7b6b43 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -443,7 +443,11 @@ AT_CHECK( ]], [ignore]) # Dump the data. -AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db1]) +if test "$IS_WIN32" = "no"; then + AT_CHECK([ovsdb-server -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db1]) +else + AT_CHECK([ovsdb-server -vfile -vvlog:off --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db1]) +fi AT_CHECK([ovsdb-client dump > expout]) OVS_APP_EXIT_AND_WAIT([ovsdb-server]) @@ -451,7 +455,11 @@ OVS_APP_EXIT_AND_WAIT([ovsdb-server]) ovsdb-tool create-cluster db2 db1 unix:s1.raft # Dump the data. -AT_CHECK([ovsdb-server -vconsole:off -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db2]) +if test "$IS_WIN32" = "no"; then + AT_CHECK([ovsdb-server -vconsole:off -vfile -vvlog:off --monitor --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db2]) +else + AT_CHECK([ovsdb-server -vconsole:off -vfile -vvlog:off --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db2]) +fi AT_CHECK([ovsdb-client wait ordinals connected]) AT_CHECK([ovsdb-client dump > dump2]) OVS_APP_EXIT_AND_WAIT([ovsdb-server])