Skip to content

Commit 95e12ba

Browse files
committed
added regression tests for recent changes for Solaris and FreeBSD.
1 parent 843cb73 commit 95e12ba

File tree

1 file changed

+103
-1
lines changed

1 file changed

+103
-1
lines changed

t/sanity.t

Lines changed: 103 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
use t::Config;
44

5-
plan tests => 100;
5+
plan tests => 108;
66

77
#no_diff();
88

@@ -1379,3 +1379,105 @@ clean:
13791379
rm -rf build
13801380
--- exit: 0
13811381
1382+
1383+
1384+
=== TEST 28: --with-luajit on Solaris
1385+
--- cmd: ./configure --with-luajit --dry-run --platform=solaris
1386+
--- out
1387+
platform: solaris (solaris)
1388+
cp -rp bundle/ build/
1389+
cd build
1390+
cd LuaJIT-2.0.0-beta8
1391+
gmake TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit
1392+
gmake install TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
1393+
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
1394+
export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
1395+
cd ..
1396+
cd nginx-1.0.4
1397+
./configure --prefix=/usr/local/openresty/nginx \
1398+
--add-module=../ngx_devel_kit-0.2.17 \
1399+
--add-module=../echo-nginx-module-0.37rc1 \
1400+
--add-module=../xss-nginx-module-0.03rc3 \
1401+
--add-module=../set-misc-nginx-module-0.22rc2 \
1402+
--add-module=../form-input-nginx-module-0.07rc5 \
1403+
--add-module=../encrypted-session-nginx-module-0.01 \
1404+
--add-module=../ngx_lua-0.2.1rc4 \
1405+
--add-module=../headers-more-nginx-module-0.15 \
1406+
--add-module=../srcache-nginx-module-0.12 \
1407+
--add-module=../array-var-nginx-module-0.03rc1 \
1408+
--add-module=../memc-nginx-module-0.12 \
1409+
--add-module=../redis2-nginx-module-0.07 \
1410+
--add-module=../upstream-keepalive-nginx-module-0.3 \
1411+
--add-module=../auth-request-nginx-module-0.2 \
1412+
--add-module=../rds-json-nginx-module-0.12rc1 \
1413+
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
1414+
--with-http_ssl_module
1415+
cd ../..
1416+
Type the following commands to build and install:
1417+
gmake
1418+
gmake install
1419+
--- makefile
1420+
.PHONY: all install clean
1421+
1422+
all:
1423+
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: INSTALL_X='$OPENRESTY_BUILD_DIR/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit
1424+
cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE)
1425+
1426+
install:
1427+
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: INSTALL_X='/home/agentz/git/ngx_openresty/ngx_openresty-1.0.4.2rc13/build/install -m 0755' INSTALL_F='$OPENRESTY_BUILD_DIR/install -m 0644' PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
1428+
cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
1429+
1430+
clean:
1431+
rm -rf build
1432+
1433+
1434+
1435+
=== TEST 29: --with-luajit on FreeBSD
1436+
--- cmd: ./configure --with-luajit --dry-run --platform=freebsd
1437+
--- out
1438+
platform: freebsd (freebsd)
1439+
cp -rp bundle/ build/
1440+
cd build
1441+
cd LuaJIT-2.0.0-beta8
1442+
gmake TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit
1443+
gmake install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$OPENRESTY_BUILD_DIR/luajit-root
1444+
export LUAJIT_LIB='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/lib'
1445+
export LUAJIT_INC='$OPENRESTY_BUILD_DIR/luajit-root/usr/local/openresty/luajit/include/luajit-2.0'
1446+
cd ..
1447+
cd nginx-1.0.4
1448+
./configure --prefix=/usr/local/openresty/nginx \
1449+
--add-module=../ngx_devel_kit-0.2.17 \
1450+
--add-module=../echo-nginx-module-0.37rc1 \
1451+
--add-module=../xss-nginx-module-0.03rc3 \
1452+
--add-module=../set-misc-nginx-module-0.22rc2 \
1453+
--add-module=../form-input-nginx-module-0.07rc5 \
1454+
--add-module=../encrypted-session-nginx-module-0.01 \
1455+
--add-module=../ngx_lua-0.2.1rc4 \
1456+
--add-module=../headers-more-nginx-module-0.15 \
1457+
--add-module=../srcache-nginx-module-0.12 \
1458+
--add-module=../array-var-nginx-module-0.03rc1 \
1459+
--add-module=../memc-nginx-module-0.12 \
1460+
--add-module=../redis2-nginx-module-0.07 \
1461+
--add-module=../upstream-keepalive-nginx-module-0.3 \
1462+
--add-module=../auth-request-nginx-module-0.2 \
1463+
--add-module=../rds-json-nginx-module-0.12rc1 \
1464+
--with-ld-opt='-Wl,-rpath,/usr/local/openresty/luajit/lib' \
1465+
--with-http_ssl_module
1466+
cd ../..
1467+
Type the following commands to build and install:
1468+
gmake
1469+
gmake install
1470+
--- makefile
1471+
.PHONY: all install clean
1472+
1473+
all:
1474+
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit
1475+
cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE)
1476+
1477+
install:
1478+
cd $OPENRESTY_BUILD_DIR/LuaJIT-2.0.0-beta8 && $(MAKE) install TARGET_STRIP=@: CFLAGS=-I.. PREFIX=/usr/local/openresty/luajit DESTDIR=$(DESTDIR)
1479+
cd $OPENRESTY_BUILD_DIR/nginx-1.0.4 && $(MAKE) install DESTDIR=$(DESTDIR)
1480+
1481+
clean:
1482+
rm -rf build
1483+

0 commit comments

Comments
 (0)