summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorHarold Lim <haroldl@vmware.com>2013-12-17 10:32:12 -0800
committerBen Pfaff <blp@nicira.com>2013-12-17 13:16:39 -0800
commit428b2eddc9c47d8306252f0fc5218839d2ff017c (patch)
tree2f9ad52cff91369bc8e527d59ab4dcec422b3a88 /tests
parent037821cf99cadc12e0391dc3fc1961499a20c9fd (diff)
downloadopenvswitch-428b2eddc9c47d8306252f0fc5218839d2ff017c.tar.gz
Rename NOT_REACHED to OVS_NOT_REACHED
This allows other libraries to use util.h that has already defined NOT_REACHED. Signed-off-by: Harold Lim <haroldl@vmware.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/test-classifier.c8
-rw-r--r--tests/test-heap.c4
-rw-r--r--tests/test-multipath.c2
-rw-r--r--tests/test-reconnect.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/test-classifier.c b/tests/test-classifier.c
index 7555feba9..93a2dc1a8 100644
--- a/tests/test-classifier.c
+++ b/tests/test-classifier.c
@@ -191,7 +191,7 @@ tcls_remove(struct tcls *cls, const struct test_rule *rule)
return;
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
static bool
@@ -245,7 +245,7 @@ match(const struct cls_rule *wild_, const struct flow *fixed)
^ wild.flow.in_port.ofp_port)
& wild.wc.masks.in_port.ofp_port);
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
if (!eq) {
@@ -558,7 +558,7 @@ make_rule(int wc_fields, unsigned int priority, int value_pat)
} else if (f_idx == CLS_F_IDX_IN_PORT) {
match.wc.masks.in_port.ofp_port = u16_to_ofp(UINT16_MAX);
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
@@ -1113,7 +1113,7 @@ next_random_flow(struct flow *flow, unsigned int idx)
}
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
/* 16 randomly chosen flows with N >= 3 nonzero values. */
diff --git a/tests/test-heap.c b/tests/test-heap.c
index dd5aaa956..ccb14846a 100644
--- a/tests/test-heap.c
+++ b/tests/test-heap.c
@@ -221,7 +221,7 @@ test_insert_delete__(struct element *elements,
goto found;
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
found:
heap_remove(&heap, &element->heap_node);
@@ -260,7 +260,7 @@ test_insert_delete_raw__(struct element *elements,
goto found;
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
found:
heap_raw_remove(&heap, &element->heap_node);
diff --git a/tests/test-multipath.c b/tests/test-multipath.c
index bf879c7a0..7a8977927 100644
--- a/tests/test-multipath.c
+++ b/tests/test-multipath.c
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
break;
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
diff --git a/tests/test-reconnect.c b/tests/test-reconnect.c
index 020ae4822..9d1897f2e 100644
--- a/tests/test-reconnect.c
+++ b/tests/test-reconnect.c
@@ -166,7 +166,7 @@ do_run(int argc, char *argv[])
switch (action) {
default:
if (action != 0) {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
break;