[ovs-dev] [PATCH 13/16] test-jsonrpc: Add the ability to detach on Windows.

[Gurucharan Shetty]

And also disable the corresponding python tests.

Signed-off-by: Gurucharan Shetty <gshe...@nicira.com>
---
 tests/jsonrpc-py.at  |    6 +++---
 tests/test-jsonrpc.c |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/jsonrpc-py.at b/tests/jsonrpc-py.at
index 026d49a..08ffb6c 100644
--- a/tests/jsonrpc-py.at
+++ b/tests/jsonrpc-py.at
@@ -1,7 +1,7 @@
 AT_BANNER([JSON-RPC - Python])
 
 AT_SETUP([JSON-RPC request and successful reply - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
 AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen 
punix:socket])
 AT_CHECK([test -s pid])
@@ -14,7 +14,7 @@ AT_CHECK([kill `cat pid`])
 AT_CLEANUP
 
 AT_SETUP([JSON-RPC request and error reply - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
 AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen 
punix:socket])
 AT_CHECK([test -s pid])
@@ -27,7 +27,7 @@ AT_CHECK([kill `cat pid`])
 AT_CLEANUP
 
 AT_SETUP([JSON-RPC notification - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 OVS_RUNDIR=`pwd`; export OVS_RUNDIR
 AT_CHECK([$PYTHON $srcdir/test-jsonrpc.py --detach --pidfile=`pwd`/pid listen 
punix:socket])
 AT_CHECK([test -s pid])
diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index 7251265..dbd0b52 100644
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.c
@@ -44,6 +44,7 @@ test_jsonrpc_main(int argc, char *argv[])
 {
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
+    service_start(&argc, &argv);
     parse_options(argc, argv);
     run_command(argc - optind, argv + optind, get_all_commands());
 }
-- 
1.7.9.5

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev