186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed a test for Solaris.

This commit is contained in:
agentzh (章亦春) 2011-03-09 21:06:07 +08:00
parent 292e460621
commit a608dd1d15
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/sanity.t
View File

@ -1034,8 +1034,8 @@ clean:
=== TEST 16: --with-http_drizzle_module on Mac === TEST 16: --with-http_drizzle_module on Solaris
--- cmd: ./configure --with-http_drizzle_module --dry-run --platform=MacOS --- cmd: ./configure --with-http_drizzle_module --dry-run --platform=solaris
--- out --- out
cp -r bundle/ build/ cp -r bundle/ build/
cd build cd build
@ -1047,7 +1047,7 @@ export LIBDRIZZLE_LIB='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/
export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include' export LIBDRIZZLE_INC='$OPENRESTY_BUILD_DIR/libdrizzle-root/usr/local/openresty/libdrizzle/include'
cd .. cd ..
cd lua-5.1.4 cd lua-5.1.4
make macosx make solaris
make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua make install INSTALL_TOP=$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua
export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib' export LUA_LIB='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/lib'
export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include' export LUA_INC='$OPENRESTY_BUILD_DIR/lua-root/usr/local/openresty/lua/include'
@ -1071,14 +1071,14 @@ cd nginx-0.8.54
--add-module=../auth-request-nginx-module-0.2 \ --add-module=../auth-request-nginx-module-0.2 \
--add-module=../rds-json-nginx-module-0.11rc2 \ --add-module=../rds-json-nginx-module-0.11rc2 \
--with-ld-opt='-Wl,-rpath=/usr/local/openresty/libdrizzle/lib' \ --with-ld-opt='-Wl,-rpath=/usr/local/openresty/libdrizzle/lib' \
--with-http_drizzle_module --with-http_ssl_module --with-http_ssl_module
cd ../.. cd ../..
--- makefile --- makefile
.PHONY: all install .PHONY: all install
all: all:
cd build/libdrizzle-0.8 && $(MAKE) cd build/libdrizzle-0.8 && $(MAKE)
cd build/lua-5.1.4 && $(MAKE) macosx cd build/lua-5.1.4 && $(MAKE) solaris
cd build/nginx-0.8.54 && $(MAKE) cd build/nginx-0.8.54 && $(MAKE)
install: install:

2
util/ver
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
main_ver=0.8.54 main_ver=0.8.54
minor_ver=1rc1 minor_ver=1rc2
version=$main_ver.$minor_ver version=$main_ver.$minor_ver
echo $version echo $version