[ovs-dev] [PATCH 05/10] tests/library.at: Disable unix socket tests on Windows.

Gurucharan Shetty shettyg at nicira.com
Tue May 13 16:03:19 UTC 2014


Signed-off-by: Gurucharan Shetty <gshetty at nicira.com>
---
 tests/automake.mk |    7 ++++++-
 tests/library.at  |    6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/automake.mk b/tests/automake.mk
index bf80702..c115289 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -233,10 +233,15 @@ tests_ovstest_SOURCES = \
 	tests/test-sflow.c \
 	tests/test-sha1.c \
 	tests/test-stp.c \
-	tests/test-unix-socket.c \
 	tests/test-util.c \
 	tests/test-uuid.c \
 	tests/test-vconn.c
+
+if !WIN32
+tests_ovstest_SOURCES += \
+	tests/test-unix-socket.c
+endif
+
 tests_ovstest_LDADD = lib/libopenvswitch.la
 dist_check_SCRIPTS = tests/flowgen.pl
 
diff --git a/tests/library.at b/tests/library.at
index 8aeec48..0160747 100644
--- a/tests/library.at
+++ b/tests/library.at
@@ -128,6 +128,7 @@ m4_foreach(
    AT_CLEANUP])
 
 AT_SETUP([test unix socket, short pathname - C])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 AT_CHECK([ovstest test-unix-socket x])
 AT_CLEANUP
 
@@ -137,6 +138,7 @@ dnl is about 100 bytes.  On Linux, we work around this by indirecting through
 dnl a directory fd using /proc/self/fd/<dirfd>.  We do not have a workaround
 dnl for other platforms, so we skip the test there.
 AT_SETUP([test unix socket, long pathname - C])
+AT_SKIP_IF([test "$IS_WIN32" = "yes"])
 dnl Linux has a 108 byte limit; this is 150 bytes long.
 longname=012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 mkdir $longname
@@ -145,7 +147,7 @@ AT_CHECK([ovstest test-unix-socket ../$longname/socket socket])
 AT_CLEANUP
 
 AT_SETUP([test unix socket, short pathname - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 AT_CHECK([$PYTHON $srcdir/test-unix-socket.py x])
 AT_CLEANUP
 
@@ -155,7 +157,7 @@ dnl is about 100 bytes.  On Linux, we work around this by indirecting through
 dnl a directory fd using /proc/self/fd/<dirfd>.  We do not have a workaround
 dnl for other platforms, so we skip the test there.
 AT_SETUP([test unix socket, long pathname - Python])
-AT_SKIP_IF([test $HAVE_PYTHON = no])
+AT_SKIP_IF([test $HAVE_PYTHON = no || test "$IS_WIN32" = "yes"])
 dnl Linux has a 108 byte limit; this is 150 bytes long.
 longname=012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 mkdir $longname
-- 
1.7.9.5




More information about the dev mailing list