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: Re-fix a race.
[sliver-openvswitch.git]
/
tests
/
test-controller.c
diff --git
a/tests/test-controller.c
b/tests/test-controller.c
index
9596ad4
..
a615ab4
100644
(file)
--- a/
tests/test-controller.c
+++ b/
tests/test-controller.c
@@
-27,6
+27,7
@@
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
+#include "fatal-signal.h"
#include "learning-switch.h"
#include "ofp-parse.h"
#include "ofp-version-opt.h"
#include "learning-switch.h"
#include "ofp-parse.h"
#include "ofp-version-opt.h"
@@
-105,7
+106,7
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
proctitle_init(argc, argv);
set_program_name(argv[0]);
parse_options(argc, argv);
-
signal(SIGPIPE, SIG_IGN
);
+
fatal_ignore_sigpipe(
);
if (argc - optind < 1) {
ovs_fatal(0, "at least one vconn argument required; "
if (argc - optind < 1) {
ovs_fatal(0, "at least one vconn argument required; "
@@
-332,7
+333,7
@@
parse_options(int argc, char *argv[])
case OPT_WITH_FLOWS:
error = parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
&n_default_flows,
case OPT_WITH_FLOWS:
error = parse_ofp_flow_mod_file(optarg, OFPFC_ADD, &default_flows,
&n_default_flows,
- &usable_protocols
, false
);
+ &usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
if (error) {
ovs_fatal(0, "%s", error);
}