trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1178952 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES STATUS lib/ts/test_Map.cc lib/ts/test_atomic.cc
Date Tue, 04 Oct 2011 21:06:33 GMT
Author: igalic
Date: Tue Oct  4 21:06:32 2011
New Revision: 1178952

URL: http://svn.apache.org/viewvc?rev=1178952&view=rev
Log:
Backport for TS-969: tests failing on some Debian sid and Solaris

Submitter: igalic
Reviewer: igalic, zym, zwoop, jim
Backporter: igalic

Modified:
    trafficserver/traffic/branches/3.0.x/   (props changed)
    trafficserver/traffic/branches/3.0.x/CHANGES
    trafficserver/traffic/branches/3.0.x/STATUS
    trafficserver/traffic/branches/3.0.x/lib/ts/test_Map.cc
    trafficserver/traffic/branches/3.0.x/lib/ts/test_atomic.cc

Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  4 21:06:32 2011
@@ -1,4 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1155125
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1155125,1171365

Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1178952&r1=1178951&r2=1178952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Oct  4 21:06:32 2011
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.0.2
+  *) [TS-969] tests failing on some Debian sid and Solaris
+
   *) [TS-867] PluginVC crashes with TSFetchURL
 
   *) [TS-901] Valgrind found minor leaks and uninitialized variables

Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1178952&r1=1178951&r2=1178952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Oct  4 21:06:32 2011
@@ -38,13 +38,6 @@ A list of all bugs open for the next v3.
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) test: tests failing on some Debian sid and Solaris
-   Trunk patches: http://svn.apache.org/viewvc?rev=1171365&view=rev
-   Jira: https://issues.apache.org/jira/browse/TS-969
-   +1: igalic, zym, zwoop
-   +0: jim (patch looks good but cannot test)
-   zwoop says: Seems harmless to me, since it's in regression only.
-
   *) Build: Allow for our default -O3 options to be overriden via CFLAGS/CXXFLAGS
    Trunk patches: http://svn.apache.org/viewvc?rev=1175914&view=rev
    Jira: https://issues.apache.org/jira/browse/TS-967

Modified: trafficserver/traffic/branches/3.0.x/lib/ts/test_Map.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/lib/ts/test_Map.cc?rev=1178952&r1=1178951&r2=1178952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/lib/ts/test_Map.cc (original)
+++ trafficserver/traffic/branches/3.0.x/lib/ts/test_Map.cc Tue Oct  4 21:06:32 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/branches/3.0.x/lib/ts/test_atomic.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/lib/ts/test_atomic.cc?rev=1178952&r1=1178951&r2=1178952&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/lib/ts/test_atomic.cc (original)
+++ trafficserver/traffic/branches/3.0.x/lib/ts/test_atomic.cc Tue Oct  4 21:06:32 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) {



Mime
View raw message