[ovs-dev] [PATCH V2 4/4] tests: Fix fail of OVS_APP_EXIT_AND_WAIT on Windows

[Paul Boca]

The problem is that on some cases it gets called with the socket
name instead of the service name.

Signed-off-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
---
 tests/ovs-macros.at | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at
index 470c31c..604b277 100644
--- a/tests/ovs-macros.at
+++ b/tests/ovs-macros.at
@@ -135,9 +135,14 @@ dnl
 dnl Ask the daemon named DAEMON to exit, via ovs-appctl, and then waits for it
 dnl to exit.
 m4_define([OVS_APP_EXIT_AND_WAIT],
-  [TMPPID=$(cat "$OVS_RUNDIR"/$1.pid 2>/dev/null)
+  [
+   if test "$IS_WIN32" = "no"; then
+     TMPPID=$(cat "$OVS_RUNDIR"/$1.pid 2>/dev/null)
+   fi
    AT_CHECK([ovs-appctl -t $1 exit])
-   OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null])])
+   if test "$IS_WIN32" = "no"; then
+     OVS_WAIT_WHILE([kill -0 $TMPPID 2>/dev/null])
+   fi])
 
 dnl OVS_APP_EXIT_AND_WAIT_BY_TARGET(DAEMON)
 dnl
-- 
2.7.2.windows.1