Author: igalic
Date: Fri Sep 16 03:05:44 2011
New Revision: 1171365
URL: http://svn.apache.org/viewvc?rev=1171365&view=rev
Log:
Replace assert with ink_assert. Hope this fixes make check failure on Solaris.
Modified:
trafficserver/traffic/trunk/lib/ts/test_Map.cc
trafficserver/traffic/trunk/lib/ts/test_atomic.cc
Modified: trafficserver/traffic/trunk/lib/ts/test_Map.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/test_Map.cc?rev=1171365&r1=1171364&r2=1171365&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/test_Map.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/test_Map.cc Fri Sep 16 03:05:44 2011
@@ -41,72 +41,72 @@ int main(int argc, char **argv) {
hhi++;
h.put(hi);
h.put(ho);
- assert(h.put(hum) == hum);
- assert(h.put(hhi) == hi);
- assert(h.get(hhi) == hi && h.get(hi) == hi && h.get(ho) == ho);
- assert(h.get("he") == 0 && h.get("hee") == 0);
+ ink_assert(h.put(hum) == hum);
+ ink_assert(h.put(hhi) == hi);
+ ink_assert(h.get(hhi) == hi && h.get(hi) == hi && h.get(ho) == ho);
+ ink_assert(h.get("he") == 0 && h.get("hee") == 0);
h.del(ho);
- assert(h.get(ho) == 0);
+ ink_assert(h.get(ho) == 0);
StringBlockHash hh;
hh.put(hi);
hh.put(ho);
- assert(hh.put(hum) == 0);
- assert(hh.put(hhi) == hi);
- assert(hh.get(hhi) == hi && hh.get(hi) == hi && hh.get(ho) == ho);
- assert(hh.get("he") == 0 && hh.get("hee") == 0);
+ ink_assert(hh.put(hum) == 0);
+ ink_assert(hh.put(hhi) == hi);
+ ink_assert(hh.get(hhi) == hi && hh.get(hi) == hi && hh.get(ho) == ho);
+ ink_assert(hh.get("he") == 0 && hh.get("hee") == 0);
hh.del(hi);
- assert(hh.get(hhi) == 0);
- assert(hh.get(hi) == 0);
+ ink_assert(hh.get(hhi) == 0);
+ ink_assert(hh.get(hi) == 0);
HashMap<cchar *, StringHashFns, int> sh;
sh.put(hi, 1);
sh.put(ho, 2);
sh.put(hum, 3);
sh.put(hhi, 4);
- assert(sh.get(hi) == 4);
- assert(sh.get(ho) == 2);
- assert(sh.get(hum) == 3);
+ ink_assert(sh.get(hi) == 4);
+ ink_assert(sh.get(ho) == 2);
+ ink_assert(sh.get(hum) == 3);
sh.put("aa", 5);
sh.put("ab", 6);
sh.put("ac", 7);
sh.put("ad", 8);
sh.put("ae", 9);
sh.put("af", 10);
- assert(sh.get(hi) == 4);
- assert(sh.get(ho) == 2);
- assert(sh.get(hum) == 3);
- assert(sh.get("af") == 10);
- assert(sh.get("ac") == 7);
+ ink_assert(sh.get(hi) == 4);
+ ink_assert(sh.get(ho) == 2);
+ ink_assert(sh.get(hum) == 3);
+ ink_assert(sh.get("af") == 10);
+ ink_assert(sh.get("ac") == 7);
ChainHashMap<cchar *, StringHashFns, int> ssh;
ssh.put(hi, 1);
ssh.put(ho, 2);
ssh.put(hum, 3);
ssh.put(hhi, 4);
- assert(ssh.get(hi) == 4);
- assert(ssh.get(ho) == 2);
- assert(ssh.get(hum) == 3);
+ ink_assert(ssh.get(hi) == 4);
+ ink_assert(ssh.get(ho) == 2);
+ ink_assert(ssh.get(hum) == 3);
ssh.put("aa", 5);
ssh.put("ab", 6);
ssh.put("ac", 7);
ssh.put("ad", 8);
ssh.put("ae", 9);
ssh.put("af", 10);
- assert(ssh.get(hi) == 4);
- assert(ssh.get(ho) == 2);
- assert(ssh.get(hum) == 3);
- assert(ssh.get("af") == 10);
- assert(ssh.get("ac") == 7);
+ ink_assert(ssh.get(hi) == 4);
+ ink_assert(ssh.get(ho) == 2);
+ ink_assert(ssh.get(hum) == 3);
+ ink_assert(ssh.get("af") == 10);
+ ink_assert(ssh.get("ac") == 7);
ssh.del(ho);
- assert(ssh.get(ho) == 0);
+ ink_assert(ssh.get(ho) == 0);
Vec<int> ints;
ssh.get_values(ints);
- assert(ints.n == 8);
+ ink_assert(ints.n == 8);
Vec<cchar *> chars;
ssh.get_keys(chars);
- assert(chars.n == 8);
+ ink_assert(chars.n == 8);
printf("test_Map PASSED\n");
}
Modified: trafficserver/traffic/trunk/lib/ts/test_atomic.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/test_atomic.cc?rev=1171365&r1=1171364&r2=1171365&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/test_atomic.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/test_atomic.cc Fri Sep 16 03:05:44 2011
@@ -141,7 +141,7 @@ cycle_data(void *d)
// Place listItems into random queues
while (pli) {
- assert((pli->data1 ^ pli->data2 ^ pli->data3 ^ pli->data4) ==
pli->check);
+ ink_assert((pli->data1 ^ pli->data2 ^ pli->data3 ^ pli->data4) ==
pli->check);
pli_next = (struct listItem *) pli->link;
pli->link = 0;
ink_atomiclist_push(&alists[(me + rand()) % MAX_ATOMIC_LISTS], (void *)
pli);
@@ -225,7 +225,7 @@ main(int argc, const char *argv[])
init_data();
for (id = 0; id < MAX_TEST_THREADS; id++) {
- assert(thr_create(NULL, 0, cycle_data, (void *) id, THR_NEW_LWP, NULL)
== 0);
+ ink_assert(thr_create(NULL, 0, cycle_data, (void *) id, THR_NEW_LWP,
NULL) == 0);
}
}
while (1) {
