Browse files

we no longer bundle Test::Nginx with us.

  • Loading branch information...
1 parent bd7fc5d commit 9e0add7cc3f5cf368943f5db56f43c654f70cf10 @agentzh agentzh committed Jan 26, 2011
Showing with 90 additions and 4 deletions.
  1. +3 −2 .gitignore
  2. 0 {test → }/t/sanity.t
  3. +15 −2 util/build.sh
  4. +72 −0 valgrind.suppress
View
5 .gitignore
@@ -11,7 +11,7 @@ print.txt
.rsync
*.tar.gz
dist
-build[78]
+build[789]
build
tags
update-readme
@@ -21,7 +21,7 @@ test/blib
test.sh
t.sh
t/t.sh
-test/t/servroot/
+t/servroot/
releng
reset
*.t_
@@ -32,3 +32,4 @@ ctags
src/module.c
src/util.c
src/util.h
+all.sh
View
0 test/t/sanity.t → t/sanity.t
File renamed without changes.
View
17 util/build.sh
@@ -7,7 +7,10 @@ rm ~/work/nginx-0.8.41/objs/addon/ndk/ndk.o ~/work/nginx-0.8.41/objs/addon/ndk-n
root=`pwd`
home=~
-cd ~/work
+if [ !-d ~/work ]; then
+ mkdir ~/work
+fi
+cd ~/work || exit 1
version=$1
opts=$2
@@ -39,11 +42,21 @@ fi
cd nginx-$version/
if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
./configure --prefix=/opt/nginx \
+ --without-mail_pop3_module \
+ --without-mail_imap_module \
+ --without-mail_smtp_module \
+ --without-http_upstream_ip_hash_module \
+ --without-http_empty_gif_module \
+ --without-http_memcached_module \
+ --without-http_referer_module \
+ --without-http_autoindex_module \
+ --without-http_auth_basic_module \
+ --without-http_userid_module \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../ndk-nginx-module \
--add-module=$root/../set-misc-nginx-module \
--add-module=$root $opts \
- --with-debug
+ --with-debug || exit 1
#--add-module=$home/work/ndk \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
View
72 valgrind.suppress
@@ -0,0 +1,72 @@
+{
+ nginx-core-process-init
+ Memcheck:Leak
+ fun:malloc
+ fun:ngx_alloc
+ fun:ngx_event_process_init
+ fun:ngx_single_process_cycle
+ fun:main
+}
+{
+ nginx-core-crc32-init
+ Memcheck:Leak
+ fun:malloc
+ fun:ngx_alloc
+ fun:ngx_crc32_table_init
+ fun:main
+}
+{
+ palloc_large_for_init_request
+ Memcheck:Leak
+ fun:malloc
+ fun:ngx_alloc
+ fun:ngx_palloc_large
+ fun:ngx_palloc
+ fun:ngx_pcalloc
+ fun:ngx_http_init_request
+ fun:ngx_epoll_process_events
+ fun:ngx_process_events_and_timers
+ fun:ngx_single_process_cycle
+ fun:main
+}
+{
+ palloc_large_for_create_temp_buf
+ Memcheck:Leak
+ fun:malloc
+ fun:ngx_alloc
+ fun:ngx_palloc_large
+ fun:ngx_palloc
+ fun:ngx_create_temp_buf
+ fun:ngx_http_init_request
+ fun:ngx_epoll_process_events
+ fun:ngx_process_events_and_timers
+ fun:ngx_single_process_cycle
+ fun:main
+}
+{
+ accept_create_pool
+ Memcheck:Leak
+ fun:memalign
+ fun:posix_memalign
+ fun:ngx_memalign
+ fun:ngx_create_pool
+ fun:ngx_event_accept
+ fun:ngx_epoll_process_events
+ fun:ngx_process_events_and_timers
+ fun:ngx_single_process_cycle
+ fun:main
+}
+{
+ create_pool_for_init_req
+ Memcheck:Leak
+ fun:memalign
+ fun:posix_memalign
+ fun:ngx_memalign
+ fun:ngx_create_pool
+ fun:ngx_http_init_request
+ fun:ngx_epoll_process_events
+ fun:ngx_process_events_and_timers
+ fun:ngx_single_process_cycle
+ fun:main
+}
+

0 comments on commit 9e0add7

Please sign in to comment.