Unfortunately ENODEV has different string representations
among platforms.
References:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/errno.h?rev=1.40&content-type=text/x-cvsweb-markup&only_with_tag=MAIN
https://svnweb.freebsd.org/base/head/lib/libc/gen/errlst.c?revision=275004&view=markup#l59
https://msdn.microsoft.com/en-us/library/5814770t.aspx
Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
tests/dpctl.at | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/tests/dpctl.at b/tests/dpctl.at
index 7921d03..890fa7c 100644
--- a/tests/dpctl.at
+++ b/tests/dpctl.at
@@ -8,10 +8,18 @@ AT_CHECK([ovs-appctl dpctl/add-dp dummy@br0], [2], [],
ovs-appctl: ovs-vswitchd: server returned an error
])
AT_CHECK([ovs-appctl dpctl/del-dp dummy@br0])
-AT_CHECK([ovs-appctl dpctl/del-dp dummy@br0], [2], [],
- [ovs-vswitchd: opening datapath (No such device)
+# NOTE: strerror(ENODEV) varies on platforms
+if test "$IS_BSD" = "yes"; then
+ AT_CHECK([ovs-appctl dpctl/del-dp dummy@br0], [2], [],
+ [ovs-vswitchd: opening datapath (Operation not supported by device)
ovs-appctl: ovs-vswitchd: server returned an error
])
+else
+ AT_CHECK([ovs-appctl dpctl/del-dp dummy@br0], [2], [],
+ [ovs-vswitchd: opening datapath (No such device)
+ovs-appctl: ovs-vswitchd: server returned an error
+])
+fi
OVS_VSWITCHD_STOP
AT_CLEANUP
@@ -71,10 +79,18 @@ AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 br0], [2], [],
ovs-appctl: ovs-vswitchd: server returned an error
])
AT_CHECK([ovs-appctl dpctl/del-dp dummy@br0])
-AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 br0], [2], [],
- [ovs-vswitchd: opening datapath (No such device)
+# NOTE: strerror(ENODEV) varies on platforms
+if test "$IS_BSD" = "yes"; then
+ AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 br0], [2], [],
+ [ovs-vswitchd: opening datapath (Operation not supported by device)
+ovs-appctl: ovs-vswitchd: server returned an error
+])
+else
+ AT_CHECK([ovs-appctl dpctl/del-if dummy@br0 br0], [2], [],
+ [ovs-vswitchd: opening datapath (No such device)
ovs-appctl: ovs-vswitchd: server returned an error
])
+fi
OVS_VSWITCHD_STOP(["/dummy@br0: port_del failed (Invalid argument)/d
/dummy@br0: failed to add vif1.0 as port: File exists/d"])
AT_CLEANUP
--
2.1.0
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
