git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Fix race condition waiting for monitor thread.
[sliver-openvswitch.git]
/
tests
/
test-unix-socket.c
diff --git
a/tests/test-unix-socket.c
b/tests/test-unix-socket.c
index
ec90048
..
037cfae
100644
(file)
--- a/
tests/test-unix-socket.c
+++ b/
tests/test-unix-socket.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010
Nicira Networks
.
+ * Copyright (c) 2010
, 2012, 2014 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,9
+22,10
@@
#include "util.h"
#include "socket-util.h"
#include "util.h"
#include "socket-util.h"
+#include "ovstest.h"
-int
-main(int argc, char *argv[])
+static void
+
test_unix_socket_
main(int argc, char *argv[])
{
const char *sockname1;
const char *sockname2;
{
const char *sockname1;
const char *sockname2;
@@
-42,7
+43,7
@@
main(int argc, char *argv[])
alarm(5);
/* Create a listening socket under name 'sockname1'. */
alarm(5);
/* Create a listening socket under name 'sockname1'. */
- sock1 = make_unix_socket(SOCK_STREAM, false,
false,
sockname1, NULL);
+ sock1 = make_unix_socket(SOCK_STREAM, false, sockname1, NULL);
if (sock1 < 0) {
ovs_fatal(-sock1, "%s: bind failed", sockname1);
}
if (sock1 < 0) {
ovs_fatal(-sock1, "%s: bind failed", sockname1);
}
@@
-52,13
+53,13
@@
main(int argc, char *argv[])
/* Connect to 'sockname2' (which should be the same file, perhaps under a
* different name). */
/* Connect to 'sockname2' (which should be the same file, perhaps under a
* different name). */
- sock2 = make_unix_socket(SOCK_STREAM, false,
false,
NULL, sockname2);
+ sock2 = make_unix_socket(SOCK_STREAM, false, NULL, sockname2);
if (sock2 < 0) {
ovs_fatal(-sock2, "%s: connect failed", sockname2);
}
close(sock1);
close(sock2);
if (sock2 < 0) {
ovs_fatal(-sock2, "%s: connect failed", sockname2);
}
close(sock1);
close(sock2);
-
- return 0;
}
}
+
+OVSTEST_REGISTER("test-unix-socket", test_unix_socket_main);