projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Fix memory leak reported by valgrind.
[cascardo/ovs.git]
/
tests
/
test-multipath.c
diff --git
a/tests/test-multipath.c
b/tests/test-multipath.c
index
f1b12e2
..
3fcc97a
100644
(file)
--- a/
tests/test-multipath.c
+++ b/
tests/test-multipath.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2010, 2012, 2013
, 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.
@@
-15,22
+15,20
@@
*/
#include <config.h>
*/
#include <config.h>
-
+#undef NDEBUG
#include "multipath.h"
#include "multipath.h"
-
#include <assert.h>
#include <getopt.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <getopt.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-
#include "flow.h"
#include "ofp-actions.h"
#include "flow.h"
#include "ofp-actions.h"
-#include "
random
.h"
+#include "
ovstest
.h"
#include "util.h"
#include "util.h"
-int
-main(int argc, char *argv[])
+static void
+
test_multipath_
main(int argc, char *argv[])
{
enum { MP_MAX_LINKS = 63 };
struct ofpact_multipath mp;
{
enum { MP_MAX_LINKS = 63 };
struct ofpact_multipath mp;
@@
-39,7
+37,6
@@
main(int argc, char *argv[])
int n;
set_program_name(argv[0]);
int n;
set_program_name(argv[0]);
- random_init();
if (argc != 2) {
ovs_fatal(0, "usage: %s multipath_action", program_name);
if (argc != 2) {
ovs_fatal(0, "usage: %s multipath_action", program_name);
@@
-65,9
+62,7
@@
main(int argc, char *argv[])
struct flow_wildcards wc;
struct flow flow;
struct flow_wildcards wc;
struct flow flow;
- random_bytes(&flow, sizeof flow);
- memset(flow.zeros, 0, sizeof flow.zeros);
- flow.mpls_depth = 0;
+ flow_random_hash_fields(&flow);
mp.max_link = n - 1;
multipath_execute(&mp, &flow, &wc);
mp.max_link = n - 1;
multipath_execute(&mp, &flow, &wc);
@@
-132,9
+127,11
@@
main(int argc, char *argv[])
break;
default:
break;
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
-
return ok ? 0 : 1
;
+
exit(ok ? 0 : 1)
;
}
}
+
+OVSTEST_REGISTER("test-multipath", test_multipath_main);