Skip to content

Commit b818c68

Browse files
committed
removed luajit false positives from valgrind.suppress since we can use a special version of luajit to run tests with valgrind now.
1 parent 39519b1 commit b818c68

File tree

2 files changed

+11
-113
lines changed

2 files changed

+11
-113
lines changed

util/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version=$1
99
force=$2
1010

1111
ngx-build $force $version \
12-
--with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$LUAJIT_LIB:/usr/local/lib" \
12+
--with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB" \
1313
--with-http_ssl_module \
1414
--without-mail_pop3_module \
1515
--without-mail_imap_module \

valgrind.suppress

Lines changed: 10 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
2-
<insert_a_suppression_name_here>
3-
Memcheck:Addr1
4-
fun:ngx_init_cycle
5-
fun:ngx_master_process_cycle
6-
fun:main
2+
<insert_a_suppression_name_here>
3+
Memcheck:Addr1
4+
fun:ngx_init_cycle
5+
fun:ngx_master_process_cycle
6+
fun:main
77
}
88
{
9-
<insert_a_suppression_name_here>
10-
Memcheck:Addr4
11-
fun:ngx_init_cycle
12-
fun:ngx_master_process_cycle
13-
fun:main
9+
<insert_a_suppression_name_here>
10+
Memcheck:Addr4
11+
fun:ngx_init_cycle
12+
fun:ngx_master_process_cycle
13+
fun:main
1414
}
1515
{
1616
<insert_a_suppression_name_here>
@@ -52,26 +52,6 @@ fun:ngx_start_worker_processes
5252
fun:ngx_master_process_cycle
5353
fun:main
5454
}
55-
{
56-
<insert_a_suppression_name_here>
57-
Memcheck:Cond
58-
fun:lj_str_new
59-
}
60-
{
61-
<insert_a_suppression_name_here>
62-
Memcheck:Cond
63-
fun:lj_str_new
64-
fun:countint
65-
fun:index2adr
66-
fun:lua_type
67-
fun:ngx_http_lua_ngx_echo
68-
}
69-
{
70-
<insert_a_suppression_name_here>
71-
Memcheck:Cond
72-
fun:lj_str_new
73-
obj:*
74-
}
7555
{
7656
<insert_a_suppression_name_here>
7757
Memcheck:Cond
@@ -100,42 +80,18 @@ fun:ngx_http_lua_ngx_echo
10080
fun:ngx_sock_ntop
10181
fun:ngx_event_accept
10282
}
103-
{
104-
<insert_a_suppression_name_here>
105-
exp-sgcheck:SorG
106-
fun:lj_str_new
107-
fun:lua_pushlstring
108-
}
10983
{
11084
<insert_a_suppression_name_here>
11185
Memcheck:Leak
11286
fun:malloc
11387
fun:ngx_alloc
11488
obj:*
11589
}
116-
{
117-
<insert_a_suppression_name_here>
118-
exp-sgcheck:SorG
119-
fun:lj_str_new
120-
fun:lua_pushlstring
121-
}
12290
{
12391
<insert_a_suppression_name_here>
12492
exp-sgcheck:SorG
12593
fun:ngx_http_lua_ndk_set_var_get
12694
}
127-
{
128-
<insert_a_suppression_name_here>
129-
exp-sgcheck:SorG
130-
fun:lj_str_new
131-
fun:lua_getfield
132-
}
133-
{
134-
<insert_a_suppression_name_here>
135-
exp-sgcheck:SorG
136-
fun:lj_str_new
137-
fun:lua_setfield
138-
}
13995
{
14096
<insert_a_suppression_name_here>
14197
exp-sgcheck:SorG
@@ -169,18 +125,6 @@ fun:ngx_http_lua_ngx_echo
169125
fun:ngx_malloc
170126
fun:ngx_pcalloc
171127
}
172-
{
173-
<insert_a_suppression_name_here>
174-
Memcheck:Addr4
175-
fun:lj_str_new
176-
fun:lua_setfield
177-
}
178-
{
179-
<insert_a_suppression_name_here>
180-
Memcheck:Addr4
181-
fun:lj_str_new
182-
fun:lua_getfield
183-
}
184128
{
185129
<insert_a_suppression_name_here>
186130
Memcheck:Leak
@@ -223,52 +167,6 @@ fun:ngx_http_lua_ngx_echo
223167
fun:ngx_memalign
224168
fun:ngx_pcalloc
225169
}
226-
{
227-
<insert_a_suppression_name_here>
228-
Memcheck:Addr4
229-
fun:lj_str_new
230-
fun:lua_pushlstring
231-
}
232-
{
233-
<insert_a_suppression_name_here>
234-
Memcheck:Cond
235-
fun:lj_str_new
236-
fun:lj_str_fromnum
237-
}
238-
{
239-
<insert_a_suppression_name_here>
240-
Memcheck:Cond
241-
fun:lj_str_new
242-
fun:lua_pushlstring
243-
}
244-
{
245-
<false_alarm_due_to_u32_alignment_in_luajit2>
246-
Memcheck:Addr4
247-
fun:lj_str_new
248-
fun:lua_setfield
249-
fun:ngx_http_lua_cache_store_code
250-
}
251-
{
252-
<insert_a_suppression_name_here>
253-
Memcheck:Cond
254-
fun:lj_str_new
255-
fun:lua_getfield
256-
fun:ngx_http_lua_cache_load_code
257-
}
258-
{
259-
<insert_a_suppression_name_here>
260-
Memcheck:Cond
261-
fun:lj_str_new
262-
fun:lua_setfield
263-
fun:ngx_http_lua_cache_store_code
264-
}
265-
{
266-
<false_alarm_due_to_u32_alignment_in_luajit2>
267-
Memcheck:Addr4
268-
fun:lj_str_new
269-
fun:lua_getfield
270-
fun:ngx_http_lua_cache_load_code
271-
}
272170
{
273171
<insert_a_suppression_name_here>
274172
Memcheck:Param

0 commit comments

Comments
 (0)