You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/06/21 12:31:29 UTC
svn commit: r1137940 - in /trafficserver/traffic/branches/3.0.x: ./
.gitignore CHANGES STATUS lib/ts/test_Vec.cc
Author: igalic
Date: Tue Jun 21 10:31:28 2011
New Revision: 1137940
URL: http://svn.apache.org/viewvc?rev=1137940&view=rev
Log:
Backport a make check failure: TS-840
Modified:
trafficserver/traffic/branches/3.0.x/ (props changed)
trafficserver/traffic/branches/3.0.x/.gitignore
trafficserver/traffic/branches/3.0.x/CHANGES
trafficserver/traffic/branches/3.0.x/STATUS
trafficserver/traffic/branches/3.0.x/lib/ts/test_Vec.cc
Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 21 10:31:28 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,1137844,1137846
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1137111,1137844,1137846
Modified: trafficserver/traffic/branches/3.0.x/.gitignore
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/.gitignore?rev=1137940&r1=1137939&r2=1137940&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/.gitignore (original)
+++ trafficserver/traffic/branches/3.0.x/.gitignore Tue Jun 21 10:31:28 2011
@@ -45,6 +45,8 @@ lib/ts/test_List
lib/ts/test_arena
lib/ts/test_atomic
lib/ts/test_freelist
+lib/ts/test_Map
+lib/ts/test_Vec
proxy/config/records.config.default
proxy/config/storage.config.default
Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1137940&r1=1137939&r2=1137940&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Tue Jun 21 10:31:28 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.0.0
+ *) [TS-840] Regression checks fail (again) due to faulty assert use.
+ Author: Arno Toell.
+
*) [TS-847] Bad timeout when using CONNECT method.
*) [TS-827] TSMimeHdrFieldValueStringInsert() can use freed memory to
Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1137940&r1=1137939&r2=1137940&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Tue Jun 21 10:31:28 2011
@@ -55,12 +55,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Jira: https://issues.apache.org/jira/browse/TS-842
+1: igalic, zwoop
- * test: Regression checks fail (again) due to faulty assert use.
- As most packages run make check, we should fix this.
- Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1137111
- Jira: https://issues.apache.org/jira/browse/TS-840
- +1: igalic, zwoop, zym
-
* API: TSHttpTxnErrorBodySet() can leak memory.
Trunk patch: http://svn.apache.org/viewvc?rev=1137775&view=rev
Jira: https://issues.apache.org/jira/browse/TS-826
Modified: trafficserver/traffic/branches/3.0.x/lib/ts/test_Vec.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/lib/ts/test_Vec.cc?rev=1137940&r1=1137939&r2=1137940&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/lib/ts/test_Vec.cc (original)
+++ trafficserver/traffic/branches/3.0.x/lib/ts/test_Vec.cc Tue Jun 21 10:31:28 2011
@@ -24,7 +24,7 @@
#include <stdint.h>
#include <stdio.h>
-#include <assert.h>
+#include <ink_assert.h>
#include "Vec.h"
int main(int argc, char **argv) {
@@ -35,7 +35,7 @@ int main(int argc, char **argv) {
v.add((void*)(intptr_t)i);
for (int i = 0; i < 100; i++)
t += (int)(intptr_t)v.v[i];
- assert(t == tt);
+ ink_assert(t == tt);
t = 0;
for (int i = 1; i < 100; i++)
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
for (int i = 0; i < vv.n; i++)
if (vv.v[i])
t += (int)(intptr_t)vv.v[i];
- assert(t == tt + 1000 * tt);
+ ink_assert(t == tt + 1000 * tt);
v.clear();
v.reserve(1000);
@@ -57,41 +57,41 @@ int main(int argc, char **argv) {
v.add((void*)(intptr_t)i);
for (int i = 0; i < 1000; i++)
t += (int)(intptr_t)v.v[i];
- assert(t == 999 * 500);
+ ink_assert(t == 999 * 500);
printf("%d %d\n", v.n, v.i);
Intervals in;
in.insert(1);
- assert(in.n == 2);
+ ink_assert(in.n == 2);
in.insert(2);
- assert(in.n == 2);
+ ink_assert(in.n == 2);
in.insert(6);
- assert(in.n == 4);
+ ink_assert(in.n == 4);
in.insert(7);
- assert(in.n == 4);
+ ink_assert(in.n == 4);
in.insert(9);
- assert(in.n == 6);
+ ink_assert(in.n == 6);
in.insert(4);
- assert(in.n == 8);
+ ink_assert(in.n == 8);
in.insert(5);
- assert(in.n == 6);
+ ink_assert(in.n == 6);
in.insert(3);
- assert(in.n == 4);
+ ink_assert(in.n == 4);
in.insert(8);
- assert(in.n == 2);
+ ink_assert(in.n == 2);
UnionFind uf;
uf.size(4);
uf.unify(0,1);
uf.unify(2,3);
- assert(uf.find(2) == uf.find(3));
- assert(uf.find(0) == uf.find(1));
- assert(uf.find(0) != uf.find(3));
- assert(uf.find(1) != uf.find(3));
- assert(uf.find(1) != uf.find(2));
- assert(uf.find(0) != uf.find(2));
+ ink_assert(uf.find(2) == uf.find(3));
+ ink_assert(uf.find(0) == uf.find(1));
+ ink_assert(uf.find(0) != uf.find(3));
+ ink_assert(uf.find(1) != uf.find(3));
+ ink_assert(uf.find(1) != uf.find(2));
+ ink_assert(uf.find(0) != uf.find(2));
uf.unify(1,2);
- assert(uf.find(0) == uf.find(3));
- assert(uf.find(1) == uf.find(3));
+ ink_assert(uf.find(0) == uf.find(3));
+ ink_assert(uf.find(1) == uf.find(3));
printf("test_Vec PASSED\n");
}